Skip to content

Commit 16593d3

Browse files
jeffgbutlerjeffgbutler
committed
Refactor to remove renderer cycles
1 parent c04c3b6 commit 16593d3

File tree

11 files changed

+184
-55
lines changed

11 files changed

+184
-55
lines changed

‎src/main/java/org/mybatis/dynamic/sql/delete/DeleteModel.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.mybatis.dynamic.sql.common.CommonBuilder;
2424
import org.mybatis.dynamic.sql.common.OrderByModel;
2525
import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
26-
import org.mybatis.dynamic.sql.delete.render.DeleteRenderer;
2726
import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
27+
import org.mybatis.dynamic.sql.render.RendererFactory;
2828
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2929
import org.mybatis.dynamic.sql.where.EmbeddedWhereModel;
3030

@@ -67,11 +67,8 @@ public Optional<OrderByModel> orderByModel() {
6767

6868
@NotNull
6969
public DeleteStatementProvider render(RenderingStrategy renderingStrategy) {
70-
return DeleteRenderer.withDeleteModel(this)
71-
.withRenderingStrategy(renderingStrategy)
72-
.withStatementConfiguration(statementConfiguration)
73-
.build()
74-
.render();
70+
return RendererFactory.createDeleteRenderer(this, statementConfiguration)
71+
.render(renderingStrategy);
7572
}
7673

7774
public static Builder withTable(SqlTable table) {

‎src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertModel.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.jetbrains.annotations.NotNull;
2121
import org.mybatis.dynamic.sql.insert.render.BatchInsert;
22-
import org.mybatis.dynamic.sql.insert.render.BatchInsertRenderer;
22+
import org.mybatis.dynamic.sql.render.RendererFactory;
2323
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2424
import org.mybatis.dynamic.sql.util.Validator;
2525

@@ -33,10 +33,8 @@ private BatchInsertModel(Builder<T> builder) {
3333

3434
@NotNull
3535
public BatchInsert<T> render(RenderingStrategy renderingStrategy) {
36-
return BatchInsertRenderer.withBatchInsertModel(this)
37-
.withRenderingStrategy(renderingStrategy)
38-
.build()
39-
.render();
36+
return RendererFactory.createBatchInsertRenderer(this)
37+
.render(renderingStrategy);
4038
}
4139

4240
public static <T> Builder<T> withRecords(Collection<T> records) {

‎src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertModel.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.jetbrains.annotations.NotNull;
2424
import org.mybatis.dynamic.sql.SqlTable;
2525
import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
26-
import org.mybatis.dynamic.sql.insert.render.GeneralInsertRenderer;
2726
import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
27+
import org.mybatis.dynamic.sql.render.RendererFactory;
2828
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2929
import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
3030
import org.mybatis.dynamic.sql.util.Validator;
@@ -52,11 +52,8 @@ public SqlTable table() {
5252

5353
@NotNull
5454
public GeneralInsertStatementProvider render(RenderingStrategy renderingStrategy) {
55-
return GeneralInsertRenderer.withInsertModel(this)
56-
.withRenderingStrategy(renderingStrategy)
57-
.withStatementConfiguration(statementConfiguration)
58-
.build()
59-
.render();
55+
return RendererFactory.createGeneralInsertRenderer(this, statementConfiguration)
56+
.render(renderingStrategy);
6057
}
6158

6259
public static class Builder {

‎src/main/java/org/mybatis/dynamic/sql/insert/InsertModel.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import org.jetbrains.annotations.NotNull;
2424
import org.mybatis.dynamic.sql.SqlTable;
25-
import org.mybatis.dynamic.sql.insert.render.InsertRenderer;
2625
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
26+
import org.mybatis.dynamic.sql.render.RendererFactory;
2727
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2828
import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
2929
import org.mybatis.dynamic.sql.util.Validator;
@@ -54,10 +54,8 @@ public SqlTable table() {
5454

5555
@NotNull
5656
public InsertStatementProvider<T> render(RenderingStrategy renderingStrategy) {
57-
return InsertRenderer.withInsertModel(this)
58-
.withRenderingStrategy(renderingStrategy)
59-
.build()
60-
.render();
57+
return RendererFactory.createInsertRenderer(this)
58+
.render(renderingStrategy);
6159
}
6260

6361
public static <T> Builder<T> withRow(T row) {

‎src/main/java/org/mybatis/dynamic/sql/insert/InsertSelectModel.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.jetbrains.annotations.NotNull;
2222
import org.mybatis.dynamic.sql.SqlTable;
2323
import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
24-
import org.mybatis.dynamic.sql.insert.render.InsertSelectRenderer;
2524
import org.mybatis.dynamic.sql.insert.render.InsertSelectStatementProvider;
25+
import org.mybatis.dynamic.sql.render.RendererFactory;
2626
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2727
import org.mybatis.dynamic.sql.select.SelectModel;
2828

@@ -53,11 +53,8 @@ public Optional<InsertColumnListModel> columnList() {
5353

5454
@NotNull
5555
public InsertSelectStatementProvider render(RenderingStrategy renderingStrategy) {
56-
return InsertSelectRenderer.withInsertSelectModel(this)
57-
.withRenderingStrategy(renderingStrategy)
58-
.withStatementConfiguration(statementConfiguration)
59-
.build()
60-
.render();
56+
return RendererFactory.createInsertSelectRenderer(this, statementConfiguration)
57+
.render(renderingStrategy);
6158
}
6259

6360
public static Builder withTable(SqlTable table) {

‎src/main/java/org/mybatis/dynamic/sql/insert/MultiRowInsertModel.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import java.util.Collection;
1919

2020
import org.jetbrains.annotations.NotNull;
21-
import org.mybatis.dynamic.sql.insert.render.MultiRowInsertRenderer;
2221
import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
22+
import org.mybatis.dynamic.sql.render.RendererFactory;
2323
import org.mybatis.dynamic.sql.render.RenderingStrategy;
2424
import org.mybatis.dynamic.sql.util.Validator;
2525

@@ -33,10 +33,8 @@ private MultiRowInsertModel(Builder<T> builder) {
3333

3434
@NotNull
3535
public MultiRowInsertStatementProvider<T> render(RenderingStrategy renderingStrategy) {
36-
return MultiRowInsertRenderer.withMultiRowInsertModel(this)
37-
.withRenderingStrategy(renderingStrategy)
38-
.build()
39-
.render();
36+
return RendererFactory.createMultiRowInsertRenderer(this)
37+
.render(renderingStrategy);
4038
}
4139

4240
public static <T> Builder<T> withRecords(Collection<T> records) {

‎src/main/java/org/mybatis/dynamic/sql/render/Renderable.java

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Copyright 2016-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.mybatis.dynamic.sql.render;
17+
18+
@FunctionalInterface
19+
public interface Renderable<T, R> {
20+
R render(T t);
21+
}

‎src/main/java/org/mybatis/dynamic/sql/render/RendererFactory.java

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
/*
2+
* Copyright 2016-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.mybatis.dynamic.sql.render;
17+
18+
import org.mybatis.dynamic.sql.configuration.StatementConfiguration;
19+
import org.mybatis.dynamic.sql.delete.DeleteModel;
20+
import org.mybatis.dynamic.sql.delete.render.DeleteRenderer;
21+
import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
22+
import org.mybatis.dynamic.sql.insert.BatchInsertModel;
23+
import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
24+
import org.mybatis.dynamic.sql.insert.InsertModel;
25+
import org.mybatis.dynamic.sql.insert.InsertSelectModel;
26+
import org.mybatis.dynamic.sql.insert.MultiRowInsertModel;
27+
import org.mybatis.dynamic.sql.insert.render.BatchInsert;
28+
import org.mybatis.dynamic.sql.insert.render.BatchInsertRenderer;
29+
import org.mybatis.dynamic.sql.insert.render.GeneralInsertRenderer;
30+
import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
31+
import org.mybatis.dynamic.sql.insert.render.InsertRenderer;
32+
import org.mybatis.dynamic.sql.insert.render.InsertSelectRenderer;
33+
import org.mybatis.dynamic.sql.insert.render.InsertSelectStatementProvider;
34+
import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
35+
import org.mybatis.dynamic.sql.insert.render.MultiRowInsertRenderer;
36+
import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
37+
import org.mybatis.dynamic.sql.select.MultiSelectModel;
38+
import org.mybatis.dynamic.sql.select.SelectModel;
39+
import org.mybatis.dynamic.sql.select.render.MultiSelectRenderer;
40+
import org.mybatis.dynamic.sql.select.render.SelectRenderer;
41+
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
42+
import org.mybatis.dynamic.sql.update.UpdateModel;
43+
import org.mybatis.dynamic.sql.update.render.UpdateRenderer;
44+
import org.mybatis.dynamic.sql.update.render.UpdateStatementProvider;
45+
46+
public interface RendererFactory {
47+
static Renderable<RenderingStrategy, DeleteStatementProvider> createDeleteRenderer(DeleteModel deleteModel,
48+
StatementConfiguration statementConfiguration) {
49+
return renderingStrategy -> DeleteRenderer.withDeleteModel(deleteModel)
50+
.withStatementConfiguration(statementConfiguration)
51+
.withRenderingStrategy(renderingStrategy)
52+
.build()
53+
.render();
54+
}
55+
56+
static <T> Renderable<RenderingStrategy, BatchInsert<T>> createBatchInsertRenderer(
57+
BatchInsertModel<T> batchInsertModel) {
58+
return renderingStrategy -> BatchInsertRenderer.withBatchInsertModel(batchInsertModel)
59+
.withRenderingStrategy(renderingStrategy)
60+
.build()
61+
.render();
62+
}
63+
64+
static Renderable<RenderingStrategy, GeneralInsertStatementProvider> createGeneralInsertRenderer(
65+
GeneralInsertModel generalInsertModel, StatementConfiguration statementConfiguration) {
66+
return renderingStrategy -> GeneralInsertRenderer.withInsertModel(generalInsertModel)
67+
.withStatementConfiguration(statementConfiguration)
68+
.withRenderingStrategy(renderingStrategy)
69+
.build()
70+
.render();
71+
}
72+
73+
static <T> Renderable<RenderingStrategy, InsertStatementProvider<T>> createInsertRenderer(
74+
InsertModel<T> insertModel) {
75+
return renderingStrategy -> InsertRenderer.withInsertModel(insertModel)
76+
.withRenderingStrategy(renderingStrategy)
77+
.build()
78+
.render();
79+
}
80+
81+
static Renderable<RenderingStrategy, InsertSelectStatementProvider> createInsertSelectRenderer(
82+
InsertSelectModel insertSelectModel, StatementConfiguration statementConfiguration) {
83+
return renderingStrategy -> InsertSelectRenderer.withInsertSelectModel(insertSelectModel)
84+
.withStatementConfiguration(statementConfiguration)
85+
.withRenderingStrategy(renderingStrategy)
86+
.build()
87+
.render();
88+
}
89+
90+
static <T> Renderable<RenderingStrategy, MultiRowInsertStatementProvider<T>> createMultiRowInsertRenderer(
91+
MultiRowInsertModel<T> multiRowInsertModel) {
92+
return renderingStrategy -> MultiRowInsertRenderer.withMultiRowInsertModel(multiRowInsertModel)
93+
.withRenderingStrategy(renderingStrategy)
94+
.build()
95+
.render();
96+
}
97+
98+
static Renderable<RenderingStrategy, SelectStatementProvider> createMultiSelectRenderer(
99+
MultiSelectModel multiSelectModel, StatementConfiguration statementConfiguration) {
100+
return renderingStrategy -> new MultiSelectRenderer.Builder()
101+
.withMultiSelectModel(multiSelectModel)
102+
.withStatementConfiguration(statementConfiguration)
103+
.withRenderingStrategy(renderingStrategy)
104+
.build()
105+
.render();
106+
}
107+
108+
static Renderable<RenderingStrategy, SelectStatementProvider> createSelectRenderer(
109+
SelectModel selectModel, StatementConfiguration statementConfiguration) {
110+
return renderingStrategy -> {
111+
RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy)
112+
.withStatementConfiguration(statementConfiguration)
113+
.build();
114+
115+
return createSelectRenderer(selectModel).render(renderingContext);
116+
};
117+
}
118+
119+
static Renderable<RenderingContext, SelectStatementProvider> createSelectRenderer(
120+
SelectModel selectModel) {
121+
return renderingContext -> SelectRenderer.withSelectModel(selectModel)
122+
.withRenderingContext(renderingContext)
123+
.build()
124+
.render();
125+
}
126+
127+
static Renderable<RenderingStrategy, UpdateStatementProvider> createUpdateRenderer(
128+
UpdateModel updateModel, StatementConfiguration statementConfiguration) {
129+
return renderingStrategy -> UpdateRenderer.withUpdateModel(updateModel)
130+
.withStatementConfiguration(statementConfiguration)
131+
.withRenderingStrategy(renderingStrategy)
132+
.build()
133+
.render();
134+
}
135+
}

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.stream.Stream;
2222

2323
import org.jetbrains.annotations.NotNull;
24+
import org.mybatis.dynamic.sql.render.RendererFactory;
2425
import org.mybatis.dynamic.sql.render.RenderingStrategy;
25-
import org.mybatis.dynamic.sql.select.render.MultiSelectRenderer;
2626
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
2727
import org.mybatis.dynamic.sql.util.Validator;
2828

@@ -47,12 +47,8 @@ public Stream<UnionQuery> unionQueries() {
4747

4848
@NotNull
4949
public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
50-
return new MultiSelectRenderer.Builder()
51-
.withMultiSelectModel(this)
52-
.withRenderingStrategy(renderingStrategy)
53-
.withStatementConfiguration(statementConfiguration)
54-
.build()
55-
.render();
50+
return RendererFactory.createMultiSelectRenderer(this, statementConfiguration)
51+
.render(renderingStrategy);
5652
}
5753

5854
public static class Builder extends AbstractBuilder<Builder> {

‎src/main/java/org/mybatis/dynamic/sql/select/SelectModel.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import java.util.stream.Stream;
2222

2323
import org.jetbrains.annotations.NotNull;
24+
import org.mybatis.dynamic.sql.render.RendererFactory;
2425
import org.mybatis.dynamic.sql.render.RenderingContext;
2526
import org.mybatis.dynamic.sql.render.RenderingStrategy;
26-
import org.mybatis.dynamic.sql.select.render.SelectRenderer;
2727
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
2828
import org.mybatis.dynamic.sql.util.Validator;
2929

@@ -42,10 +42,8 @@ public Stream<QueryExpressionModel> queryExpressions() {
4242

4343
@NotNull
4444
public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
45-
RenderingContext renderingContext = RenderingContext.withRenderingStrategy(renderingStrategy)
46-
.withStatementConfiguration(statementConfiguration)
47-
.build();
48-
return render(renderingContext);
45+
return RendererFactory.createSelectRenderer(this, statementConfiguration)
46+
.render(renderingStrategy);
4947
}
5048

5149
/**
@@ -56,10 +54,7 @@ public SelectStatementProvider render(RenderingStrategy renderingStrategy) {
5654
*/
5755
@NotNull
5856
public SelectStatementProvider render(RenderingContext renderingContext) {
59-
return SelectRenderer.withSelectModel(this)
60-
.withRenderingContext(renderingContext)
61-
.build()
62-
.render();
57+
return RendererFactory.createSelectRenderer(this).render(renderingContext);
6358
}
6459

6560
public static Builder withQueryExpressions(List<QueryExpressionModel> queryExpressions) {

0 commit comments

Comments
 (0)