Refactor to restore coverage

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/select/LimitAndOffsetPagingModel.java

@@ -15,6 +15,7 @@
  */
 package org.mybatis.dynamic.sql.select;
 
+import java.util.Objects;
 import java.util.Optional;
 
 public class LimitAndOffsetPagingModel implements PagingModel {
@@ -23,12 +24,12 @@ public class LimitAndOffsetPagingModel implements PagingModel {
     private Long offset;
 
     private LimitAndOffsetPagingModel(Builder builder) {
-        this.limit = builder.limit;
+        this.limit = Objects.requireNonNull(builder.limit);
         this.offset = builder.offset;
     }
 
-    public Optional<Long> limit() {
-        return Optional.ofNullable(limit);
+    public Long limit() {
+        return limit;
     }
 
     public Optional<Long> offset() {

src/main/java/org/mybatis/dynamic/sql/select/SelectDSL.java

@@ -166,7 +166,7 @@ public FetchFirstFinisher fetchFirst(long fetchFirstRows) {
 
         @Override
         public R build() {
-            SelectDSL.this.pagingModel = new LimitAndOffsetPagingModel.Builder()
+            SelectDSL.this.pagingModel = new FetchFirstPagingModel.Builder()
                     .withOffset(offset)
                     .build();
             return SelectDSL.this.build();

src/main/java/org/mybatis/dynamic/sql/select/render/LimitAndOffsetPagingModelRenderer.java

@@ -34,38 +34,21 @@ public LimitAndOffsetPagingModelRenderer(RenderingStrategy renderingStrategy,
     }
 
     public Optional<FragmentAndParameters> render() {
-        return pagingModel.limit()
-                .map(this::renderWithLimit)
-                .orElseGet(this::renderOffsetOnly);
-    }
-
-    private Optional<FragmentAndParameters> renderWithLimit(Long limit) {
         return pagingModel.offset()
-                .map(o -> renderLimitAndOffset(limit, o))
-                .orElseGet(() -> renderLimitOnly(limit));
-    }
-    
-    private Optional<FragmentAndParameters> renderOffsetOnly() {
-        return pagingModel.offset().flatMap(this::renderOffsetOnly);
-    }
-    
-    private Optional<FragmentAndParameters> renderOffsetOnly(Long offset) {
-        return FragmentAndParameters
-                .withFragment("offset " + renderPlaceholder(OFFSET_PARAMETER)) //$NON-NLS-1$
-                .withParameter(OFFSET_PARAMETER, offset)
-                .buildOptional();
+                .map(this::renderLimitAndOffset)
+                .orElseGet(this::renderLimitOnly);
     }
-    
-    private Optional<FragmentAndParameters> renderLimitOnly(Long limit) {
+
+    private Optional<FragmentAndParameters> renderLimitOnly() {
         return FragmentAndParameters.withFragment("limit " + renderPlaceholder(LIMIT_PARAMETER)) //$NON-NLS-1$
-                .withParameter(LIMIT_PARAMETER, limit)
+                .withParameter(LIMIT_PARAMETER, pagingModel.limit())
                 .buildOptional();
     }
 
-    private Optional<FragmentAndParameters> renderLimitAndOffset(Long limit, Long offset) {
+    private Optional<FragmentAndParameters> renderLimitAndOffset(Long offset) {
         return FragmentAndParameters.withFragment("limit " + renderPlaceholder(LIMIT_PARAMETER) //$NON-NLS-1$
                     + " offset " + renderPlaceholder(OFFSET_PARAMETER)) //$NON-NLS-1$
-                .withParameter(LIMIT_PARAMETER, limit)
+                .withParameter(LIMIT_PARAMETER, pagingModel.limit())
                 .withParameter(OFFSET_PARAMETER, offset)
                 .buildOptional();
     }