Make method overridable

jeffgbutler · jeffgbutler · commit a0f26a31ed36 · 2023-04-18T18:09:44.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java b/src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java
@@ -92,7 +92,7 @@ private Optional<FragmentAndParameters> calculateLimitClause() {
     }
 
     private FragmentAndParameters renderLimitClause(Long limit) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
         String jdbcPlaceholder =
                 renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX, mapKey);
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertValuePhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertValuePhraseVisitor.java
@@ -85,7 +85,7 @@ private Optional<FieldAndValueAndParameters> buildNullFragment(AbstractColumnMap
     }
 
     private Optional<FieldAndValueAndParameters> buildFragment(AbstractColumnMapping mapping, Object value) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
 
         String jdbcPlaceholder = mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapKey));
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java
@@ -22,7 +22,7 @@
 public abstract class RenderingStrategy {
     public static final String DEFAULT_PARAMETER_PREFIX = "parameters"; //$NON-NLS-1$
 
-    public static String formatParameterMapKey(AtomicInteger sequence) {
+    public String formatParameterMapKey(AtomicInteger sequence) {
         return "p" + sequence.getAndIncrement(); //$NON-NLS-1$
     }
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/FetchFirstPagingModelRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/FetchFirstPagingModelRenderer.java
@@ -55,7 +55,7 @@ private FragmentAndParameters renderFetchFirstRowsOnly() {
     }
 
     private FragmentAndParameters renderFetchFirstRowsOnly(Long fetchFirstRows) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
         return FragmentAndParameters
                 .withFragment("fetch first " + renderPlaceholder(mapKey) //$NON-NLS-1$
                     + " rows only") //$NON-NLS-1$
@@ -64,16 +64,16 @@ private FragmentAndParameters renderFetchFirstRowsOnly(Long fetchFirstRows) {
     }
 
     private FragmentAndParameters renderOffsetOnly(Long offset) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
         return FragmentAndParameters.withFragment("offset " + renderPlaceholder(mapKey) //$NON-NLS-1$
                 + " rows") //$NON-NLS-1$
                 .withParameter(mapKey, offset)
                 .build();
     }
 
     private FragmentAndParameters renderOffsetAndFetchFirstRows(Long offset, Long fetchFirstRows) {
-        String mapKey1 = RenderingStrategy.formatParameterMapKey(sequence);
-        String mapKey2 = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey1 = renderingStrategy.formatParameterMapKey(sequence);
+        String mapKey2 = renderingStrategy.formatParameterMapKey(sequence);
         return FragmentAndParameters.withFragment("offset " + renderPlaceholder(mapKey1) //$NON-NLS-1$
                 + " rows fetch first " + renderPlaceholder(mapKey2) //$NON-NLS-1$
                 + " rows only") //$NON-NLS-1$
diff --git a/src/main/java/org/mybatis/dynamic/sql/select/render/LimitAndOffsetPagingModelRenderer.java b/src/main/java/org/mybatis/dynamic/sql/select/render/LimitAndOffsetPagingModelRenderer.java
@@ -42,15 +42,15 @@ public FragmentAndParameters render() {
     }
 
     private FragmentAndParameters renderLimitOnly() {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
         return FragmentAndParameters.withFragment("limit " + renderPlaceholder(mapKey)) //$NON-NLS-1$
                 .withParameter(mapKey, limit)
                 .build();
     }
 
     private FragmentAndParameters renderLimitAndOffset(Long offset) {
-        String mapKey1 = RenderingStrategy.formatParameterMapKey(sequence);
-        String mapKey2 = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey1 = renderingStrategy.formatParameterMapKey(sequence);
+        String mapKey2 = renderingStrategy.formatParameterMapKey(sequence);
         return FragmentAndParameters.withFragment("limit " + renderPlaceholder(mapKey1) //$NON-NLS-1$
                     + " offset " + renderPlaceholder(mapKey2)) //$NON-NLS-1$
                 .withParameter(mapKey1, limit)
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/render/SetPhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/update/render/SetPhraseVisitor.java
@@ -127,7 +127,7 @@ public Optional<FragmentAndParameters> visit(ColumnToColumnMapping mapping) {
     }
 
     private <T> Optional<FragmentAndParameters> buildFragment(AbstractColumnMapping mapping, T value) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
 
         String jdbcPlaceholder = mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapKey));
         String setPhrase = mapping.mapColumn(aliasedColumnNameFunction)
diff --git a/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java b/src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java
@@ -122,7 +122,7 @@ private Optional<FragmentAndParameters> calculateLimitClause() {
     }
 
     private FragmentAndParameters renderLimitClause(Long limit) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
         String jdbcPlaceholder =
                 renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX, mapKey);
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/where/render/WhereConditionVisitor.java b/src/main/java/org/mybatis/dynamic/sql/where/render/WhereConditionVisitor.java
@@ -67,7 +67,7 @@ public FragmentAndParameters visit(AbstractNoValueCondition<T> condition) {
 
     @Override
     public FragmentAndParameters visit(AbstractSingleValueCondition<T> condition) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
         String fragment = condition.renderCondition(columnName(),
                 getFormattedJdbcPlaceholder(mapKey));
 
@@ -78,8 +78,8 @@ public FragmentAndParameters visit(AbstractSingleValueCondition<T> condition) {
 
     @Override
     public FragmentAndParameters visit(AbstractTwoValueCondition<T> condition) {
-        String mapKey1 = RenderingStrategy.formatParameterMapKey(sequence);
-        String mapKey2 = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey1 = renderingStrategy.formatParameterMapKey(sequence);
+        String mapKey2 = renderingStrategy.formatParameterMapKey(sequence);
         String fragment = condition.renderCondition(columnName(),
                 getFormattedJdbcPlaceholder(mapKey1),
                 getFormattedJdbcPlaceholder(mapKey2));
@@ -118,7 +118,7 @@ private Object convertValue(T value) {
     }
 
     private FragmentAndParameters toFragmentAndParameters(T value) {
-        String mapKey = RenderingStrategy.formatParameterMapKey(sequence);
+        String mapKey = renderingStrategy.formatParameterMapKey(sequence);
 
         return FragmentAndParameters.withFragment(getFormattedJdbcPlaceholder(mapKey))
                 .withParameter(mapKey, convertValue(value))

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ private Optional<FragmentAndParameters> calculateLimitClause() {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`private FragmentAndParameters renderLimitClause(Long limit) {`
`95`		`- String mapKey = RenderingStrategy.formatParameterMapKey(sequence);`
	`95`	`+ String mapKey = renderingStrategy.formatParameterMapKey(sequence);`
`96`	`96`	`String jdbcPlaceholder =`
`97`	`97`	`renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX, mapKey);`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ private Optional<FieldAndValueAndParameters> buildNullFragment(AbstractColumnMap`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private Optional<FieldAndValueAndParameters> buildFragment(AbstractColumnMapping mapping, Object value) {`
`88`		`- String mapKey = RenderingStrategy.formatParameterMapKey(sequence);`
	`88`	`+ String mapKey = renderingStrategy.formatParameterMapKey(sequence);`
`89`	`89`
`90`	`90`	`String jdbcPlaceholder = mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapKey));`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`public abstract class RenderingStrategy {`
`23`	`23`	`public static final String DEFAULT_PARAMETER_PREFIX = "parameters"; //$NON-NLS-1$`
`24`	`24`
`25`		`- public static String formatParameterMapKey(AtomicInteger sequence) {`
	`25`	`+ public String formatParameterMapKey(AtomicInteger sequence) {`
`26`	`26`	`return "p" + sequence.getAndIncrement(); //$NON-NLS-1$`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public Optional<FragmentAndParameters> visit(ColumnToColumnMapping mapping) {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`private <T> Optional<FragmentAndParameters> buildFragment(AbstractColumnMapping mapping, T value) {`
`130`		`- String mapKey = RenderingStrategy.formatParameterMapKey(sequence);`
	`130`	`+ String mapKey = renderingStrategy.formatParameterMapKey(sequence);`
`131`	`131`
`132`	`132`	`String jdbcPlaceholder = mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapKey));`
`133`	`133`	`String setPhrase = mapping.mapColumn(aliasedColumnNameFunction)`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ private Optional<FragmentAndParameters> calculateLimitClause() {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`private FragmentAndParameters renderLimitClause(Long limit) {`
`125`		`- String mapKey = RenderingStrategy.formatParameterMapKey(sequence);`
	`125`	`+ String mapKey = renderingStrategy.formatParameterMapKey(sequence);`
`126`	`126`	`String jdbcPlaceholder =`
`127`	`127`	`renderingStrategy.getFormattedJdbcPlaceholder(RenderingStrategy.DEFAULT_PARAMETER_PREFIX, mapKey);`
`128`	`128`