Modified issue142 code format

Author: liuhuagui

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

@@ -1,17 +1,17 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Copyright 2016-2019 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.mybatis.dynamic.sql.select.render;
 
@@ -30,12 +30,12 @@ public class FetchFirstPagingModelRenderer {
     private AtomicInteger sequence;
 
     public FetchFirstPagingModelRenderer(RenderingStrategy renderingStrategy,
-            PagingModel pagingModel,AtomicInteger sequence) {
+                                         PagingModel pagingModel, AtomicInteger sequence) {
         this.renderingStrategy = renderingStrategy;
         this.pagingModel = pagingModel;
         this.sequence = sequence;
     }
-    
+
     public Optional<FragmentAndParameters> render() {
         return pagingModel.offset()
                 .map(this::renderWithOffset)
@@ -47,34 +47,34 @@ private Optional<FragmentAndParameters> renderWithOffset(Long offset) {
                 .map(ffr -> renderOffsetAndFetchFirstRows(offset, ffr))
                 .orElseGet(() -> renderOffsetOnly(offset));
     }
-    
+
     private Optional<FragmentAndParameters> renderFetchFirstRowsOnly() {
         return pagingModel.fetchFirstRows().flatMap(this::renderFetchFirstRowsOnly);
     }
-    
+
     private Optional<FragmentAndParameters> renderFetchFirstRowsOnly(Long fetchFirstRows) {
         String mapKey = formatParameterMapKey(FETCH_FIRST_ROWS_PARAMETER);
         return FragmentAndParameters
                 .withFragment("fetch first " + renderPlaceholder(mapKey) //$NON-NLS-1$
-                + " rows only") //$NON-NLS-1$
+                        + " rows only") //$NON-NLS-1$
                 .withParameter(mapKey, fetchFirstRows)
                 .buildOptional();
     }
-    
+
     private Optional<FragmentAndParameters> renderOffsetOnly(Long offset) {
         String mapKey = formatParameterMapKey(OFFSET_PARAMETER);
         return FragmentAndParameters.withFragment("offset " + renderPlaceholder(mapKey) //$NON-NLS-1$
-                    + " rows") //$NON-NLS-1$
+                + " rows") //$NON-NLS-1$
                 .withParameter(mapKey, offset)
                 .buildOptional();
     }
-    
+
     private Optional<FragmentAndParameters> renderOffsetAndFetchFirstRows(Long offset, Long fetchFirstRows) {
         String mapKey1 = formatParameterMapKey(OFFSET_PARAMETER);
         String mapKey2 = formatParameterMapKey(FETCH_FIRST_ROWS_PARAMETER);
         return FragmentAndParameters.withFragment("offset " + renderPlaceholder(mapKey1) //$NON-NLS-1$
-                    + " rows fetch first " + renderPlaceholder(mapKey2) //$NON-NLS-1$
-                    + " rows only") //$NON-NLS-1$
+                + " rows fetch first " + renderPlaceholder(mapKey2) //$NON-NLS-1$
+                + " rows only") //$NON-NLS-1$
                 .withParameter(mapKey1, offset)
                 .withParameter(mapKey2, fetchFirstRows)
                 .buildOptional();
@@ -83,9 +83,9 @@ private Optional<FragmentAndParameters> renderOffsetAndFetchFirstRows(Long offse
     private String formatParameterMapKey(String parameterMapKey) {
         return parameterMapKey + sequence.getAndIncrement(); //$NON-NLS-1$
     }
-    
+
     private String renderPlaceholder(String parameterName) {
         return renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX,
-                parameterName); 
+                parameterName);
     }
 }

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

@@ -1,17 +1,17 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Copyright 2016-2019 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.mybatis.dynamic.sql.select.render;
 
@@ -31,13 +31,13 @@ public class LimitAndOffsetPagingModelRenderer {
     private AtomicInteger sequence;
 
     public LimitAndOffsetPagingModelRenderer(RenderingStrategy renderingStrategy,
-            Long limit, PagingModel pagingModel,AtomicInteger sequence) {
+                                             Long limit, PagingModel pagingModel, AtomicInteger sequence) {
         this.renderingStrategy = renderingStrategy;
         this.limit = limit;
         this.pagingModel = pagingModel;
         this.sequence = sequence;
     }
-    
+
     public Optional<FragmentAndParameters> render() {
         return pagingModel.offset().map(this::renderLimitAndOffset)
                 .orElseGet(this::renderLimitOnly);
@@ -49,12 +49,12 @@ private Optional<FragmentAndParameters> renderLimitOnly() {
                 .withParameter(mapKey, limit)
                 .buildOptional();
     }
-    
+
     private Optional<FragmentAndParameters> renderLimitAndOffset(Long offset) {
         String mapKey1 = formatParameterMapKey(LIMIT_PARAMETER);
         String mapKey2 = formatParameterMapKey(OFFSET_PARAMETER);
         return FragmentAndParameters.withFragment("limit " + renderPlaceholder(mapKey1) //$NON-NLS-1$
-                    + " offset " + renderPlaceholder(mapKey2)) //$NON-NLS-1$
+                + " offset " + renderPlaceholder(mapKey2)) //$NON-NLS-1$
                 .withParameter(mapKey1, limit)
                 .withParameter(mapKey2, offset)
                 .buildOptional();
@@ -63,9 +63,9 @@ private Optional<FragmentAndParameters> renderLimitAndOffset(Long offset) {
     private String formatParameterMapKey(String parameterMapKey) {
         return parameterMapKey + sequence.getAndIncrement(); //$NON-NLS-1$
     }
-    
+
     private String renderPlaceholder(String parameterName) {
         return renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX,
-                parameterName); 
+                parameterName);
     }
 }

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

@@ -1,17 +1,17 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Copyright 2016-2019 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.mybatis.dynamic.sql.select.render;
 
@@ -31,28 +31,28 @@ public class PagingModelRenderer {
     private PagingModelRenderer(Builder builder) {
         renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
         pagingModel = Objects.requireNonNull(builder.pagingModel);
-        sequence = builder.sequence().orElseGet(() -> new AtomicInteger(1));
+        sequence = Objects.requireNonNull(builder.sequence);
     }
-    
+
     public Optional<FragmentAndParameters> render() {
         return pagingModel.limit().map(this::limitAndOffsetRender)
                 .orElseGet(this::fetchFirstRender);
     }
-    
+
     private Optional<FragmentAndParameters> limitAndOffsetRender(Long limit) {
         return new LimitAndOffsetPagingModelRenderer(renderingStrategy, limit,
-                pagingModel,sequence).render();
+                pagingModel, sequence).render();
     }
-    
+
     private Optional<FragmentAndParameters> fetchFirstRender() {
-        return new FetchFirstPagingModelRenderer(renderingStrategy, pagingModel,sequence).render();
+        return new FetchFirstPagingModelRenderer(renderingStrategy, pagingModel, sequence).render();
     }
-    
+
     public static class Builder {
         private RenderingStrategy renderingStrategy;
         private PagingModel pagingModel;
         private AtomicInteger sequence;
-        
+
         public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
             this.renderingStrategy = renderingStrategy;
             return this;
@@ -68,10 +68,6 @@ public Builder withSequence(AtomicInteger sequence) {
             return this;
         }
 
-        private Optional<AtomicInteger> sequence() {
-            return Optional.ofNullable(sequence);
-        }
-        
         public PagingModelRenderer build() {
             return new PagingModelRenderer(this);
         }

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

@@ -1,17 +1,17 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Copyright 2016-2019 the original author or authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.mybatis.dynamic.sql.select.render;
 
@@ -34,22 +34,22 @@ public class SelectRenderer {
     private SelectModel selectModel;
     private RenderingStrategy renderingStrategy;
     private AtomicInteger sequence;
-    
+
     private SelectRenderer(Builder builder) {
         selectModel = Objects.requireNonNull(builder.selectModel);
         renderingStrategy = Objects.requireNonNull(builder.renderingStrategy);
         sequence = builder.sequence().orElseGet(() -> new AtomicInteger(1));
     }
-    
+
     public SelectStatementProvider render() {
         FragmentCollector fragmentCollector = selectModel
                 .mapQueryExpressions(this::renderQueryExpression)
                 .collect(FragmentCollector.collect());
         renderOrderBy(fragmentCollector);
         renderPagingModel(fragmentCollector);
-        
+
         String selectStatement = fragmentCollector.fragments().collect(Collectors.joining(" ")); //$NON-NLS-1$
-        
+
         return DefaultSelectStatementProvider.withSelectStatement(selectStatement)
                 .withParameters(fragmentCollector.parameters())
                 .build();
@@ -66,26 +66,26 @@ private FragmentAndParameters renderQueryExpression(QueryExpressionModel queryEx
     private void renderOrderBy(FragmentCollector fragmentCollector) {
         selectModel.orderByModel().ifPresent(om -> renderOrderBy(fragmentCollector, om));
     }
-    
+
     private void renderOrderBy(FragmentCollector fragmentCollector, OrderByModel orderByModel) {
         String phrase = orderByModel.mapColumns(this::calculateOrderByPhrase)
                 .collect(CustomCollectors.joining(", ", "order by ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
         fragmentCollector.add(FragmentAndParameters.withFragment(phrase).build());
     }
-    
+
     private String calculateOrderByPhrase(SortSpecification column) {
         String phrase = column.aliasOrName();
         if (column.isDescending()) {
             phrase = phrase + " DESC"; //$NON-NLS-1$
         }
         return phrase;
     }
-    
+
     private void renderPagingModel(FragmentCollector fragmentCollector) {
         selectModel.pagingModel().flatMap(this::renderPagingModel)
-            .ifPresent(fragmentCollector::add);
+                .ifPresent(fragmentCollector::add);
     }
-    
+
     private Optional<FragmentAndParameters> renderPagingModel(PagingModel pagingModel) {
         return new PagingModelRenderer.Builder()
                 .withPagingModel(pagingModel)
@@ -98,31 +98,31 @@ private Optional<FragmentAndParameters> renderPagingModel(PagingModel pagingMode
     public static Builder withSelectModel(SelectModel selectModel) {
         return new Builder().withSelectModel(selectModel);
     }
-    
+
     public static class Builder {
         private SelectModel selectModel;
         private RenderingStrategy renderingStrategy;
         private AtomicInteger sequence;
-        
+
         public Builder withSelectModel(SelectModel selectModel) {
             this.selectModel = selectModel;
             return this;
         }
-        
+
         public Builder withRenderingStrategy(RenderingStrategy renderingStrategy) {
             this.renderingStrategy = renderingStrategy;
             return this;
         }
-        
+
         public Builder withSequence(AtomicInteger sequence) {
             this.sequence = sequence;
             return this;
         }
-        
+
         private Optional<AtomicInteger> sequence() {
             return Optional.ofNullable(sequence);
         }
-        
+
         public SelectRenderer build() {
             return new SelectRenderer(this);
         }