Refactor nested class

Author: jeffgbutler

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

@@ -26,7 +26,7 @@
 import org.mybatis.dynamic.sql.util.Buildable;
 
 public class MultiSelectDSL implements Buildable<MultiSelectModel> {
-    private final List<MultiSelectModel.UnionQuery> unionQueries = new ArrayList<>();
+    private final List<UnionQuery> unionQueries = new ArrayList<>();
     private final SelectModel initialSelect;
     private OrderByModel orderByModel;
     private Long limit;
@@ -38,12 +38,12 @@ public MultiSelectDSL(Buildable<SelectModel> builder) {
     }
 
     public MultiSelectDSL union(Buildable<SelectModel> builder) {
-        unionQueries.add(new MultiSelectModel.UnionQuery("union", builder.build())); //$NON-NLS-1$
+        unionQueries.add(new UnionQuery("union", builder.build())); //$NON-NLS-1$
         return this;
     }
 
     public MultiSelectDSL unionAll(Buildable<SelectModel> builder) {
-        unionQueries.add(new MultiSelectModel.UnionQuery("union all", builder.build())); //$NON-NLS-1$
+        unionQueries.add(new UnionQuery("union all", builder.build())); //$NON-NLS-1$
         return this;
     }
 

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

@@ -101,22 +101,4 @@ public MultiSelectModel build() {
             return new MultiSelectModel(this);
         }
     }
-
-    public static class UnionQuery {
-        private final String connector;
-        private final SelectModel selectModel;
-
-        public UnionQuery(String connector, SelectModel selectModel) {
-            this.connector = Objects.requireNonNull(connector);
-            this.selectModel = Objects.requireNonNull(selectModel);
-        }
-
-        public String connector() {
-            return connector;
-        }
-
-        public SelectModel selectModel() {
-            return selectModel;
-        }
-    }
 }

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

@@ -0,0 +1,36 @@
+/*
+ *    Copyright 2016-2023 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
+ *
+ *       https://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.
+ */
+package org.mybatis.dynamic.sql.select;
+
+import java.util.Objects;
+
+public class UnionQuery {
+    private final String connector;
+    private final SelectModel selectModel;
+
+    public UnionQuery(String connector, SelectModel selectModel) {
+        this.connector = Objects.requireNonNull(connector);
+        this.selectModel = Objects.requireNonNull(selectModel);
+    }
+
+    public String connector() {
+        return connector;
+    }
+
+    public SelectModel selectModel() {
+        return selectModel;
+    }
+}

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

@@ -26,6 +26,7 @@
 import org.mybatis.dynamic.sql.select.MultiSelectModel;
 import org.mybatis.dynamic.sql.select.PagingModel;
 import org.mybatis.dynamic.sql.select.SelectModel;
+import org.mybatis.dynamic.sql.select.UnionQuery;
 import org.mybatis.dynamic.sql.util.FragmentAndParameters;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
 
@@ -72,7 +73,7 @@ private FragmentAndParameters renderSelect(SelectModel selectModel) {
                 .build();
     }
 
-    private FragmentAndParameters renderSelect(MultiSelectModel.UnionQuery unionQuery) {
+    private FragmentAndParameters renderSelect(UnionQuery unionQuery) {
         SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(unionQuery.selectModel())
                 .withRenderingStrategy(renderingStrategy)
                 .withSequence(sequence)