Browse Source

优化一下

miemie 6 years ago
parent
commit
e104e3f5c0

+ 4 - 10
mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectModel.java

@@ -37,11 +37,6 @@ public class DialectModel {
      */
     @Getter(AccessLevel.NONE)
     private Supplier<Configuration> configurationSupplier = () -> null;
-    /**
-     * 提供 List<ParameterMapping>
-     */
-    @Getter(AccessLevel.NONE)
-    private Supplier<List<ParameterMapping>> mappingsSupplier = () -> null;
     /**
      * 消费偏移量
      */
@@ -72,11 +67,11 @@ public class DialectModel {
      */
     public DialectModel setConsumer(boolean isFirstParam, Function<List<ParameterMapping>, Integer> function) {
         if (isFirstParam) {
-            firstParamConsumer = i -> i.add(function.apply(mappingsSupplier.get()),
-                new ParameterMapping.Builder(configurationSupplier.get(), FIRST_PARAM_NAME, long.class).build());
+            firstParamConsumer = i -> i.add(function.apply(i), new ParameterMapping
+                .Builder(configurationSupplier.get(), FIRST_PARAM_NAME, long.class).build());
         } else {
-            secondParamConsumer = i -> i.add(function.apply(mappingsSupplier.get()),
-                new ParameterMapping.Builder(configurationSupplier.get(), SECOND_PARAM_NAME, long.class).build());
+            secondParamConsumer = i -> i.add(function.apply(i), new ParameterMapping
+                .Builder(configurationSupplier.get(), SECOND_PARAM_NAME, long.class).build());
         }
         return this;
     }
@@ -120,7 +115,6 @@ public class DialectModel {
         Assert.notNull(mappings, "List<ParameterMapping> must not be null!");
         Assert.notNull(configuration, "configuration must not be null!");
         configurationSupplier = () -> configuration;
-        mappingsSupplier = () -> mappings;
         firstParamConsumer.accept(mappings);
         secondParamConsumer.accept(mappings);
     }

+ 0 - 32
mybatis-plus-extension/src/test/java/com/baomidou/mybatisplus/extension/plugins/pagination/DialectModelTest.java

@@ -1,32 +0,0 @@
-package com.baomidou.mybatisplus.extension.plugins.pagination;
-
-import org.apache.ibatis.mapping.ParameterMapping;
-import org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author miemie
- * @since 2018-10-31
- */
-public class DialectModelTest {
-
-    private static ParameterMapping testMapping = null;
-
-    @Test
-    public void m01() {
-        List<ParameterMapping> list = new ArrayList<>();
-        DialectModel model = model();
-        model.getOffsetConsumer().accept(list);
-        model.getLimitConsumer().accept(list);
-        System.out.println(list.size());
-    }
-
-    private DialectModel model() {
-        DialectModel model = new DialectModel();
-        model.setOffsetConsumer(i -> i.add(testMapping));
-        model.setLimitConsumer(i -> i.add(i.size() - 1, testMapping));
-        return model;
-    }
-}