Skip to content

Commit 58d792e

Browse files
gavinkinggavinking
committed
get rid of some typecasts
1 parent 9016ef5 commit 58d792e

12 files changed

+29
-37
lines changed

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacyDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
184184
@Override
185185
protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
186186
SessionFactoryImplementor sessionFactory, Statement statement) {
187-
return new MariaDBLegacySqlAstTranslator<>( sessionFactory, statement );
187+
return new MariaDBLegacySqlAstTranslator<>( sessionFactory, statement, MariaDBLegacyDialect.this );
188188
}
189189
};
190190
}

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
*/
4747
public class MariaDBLegacySqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
4848

49-
private MariaDBLegacyDialect dialect;
49+
private final MariaDBLegacyDialect dialect;
5050

51-
public MariaDBLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
51+
public MariaDBLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MariaDBLegacyDialect dialect) {
5252
super( sessionFactory, statement );
53-
this.dialect = (MariaDBLegacyDialect)super.getDialect();
53+
this.dialect = dialect;
5454
}
5555

5656
@Override
@@ -373,7 +373,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
373373

374374
@Override
375375
public MariaDBLegacyDialect getDialect() {
376-
return this.dialect;
376+
return dialect;
377377
}
378378

379379
private boolean supportsWindowFunctions() {

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacyDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
742742
@Override
743743
protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
744744
SessionFactoryImplementor sessionFactory, Statement statement) {
745-
return new MySQLLegacySqlAstTranslator<>( sessionFactory, statement );
745+
return new MySQLLegacySqlAstTranslator<>( sessionFactory, statement, MySQLLegacyDialect.this );
746746
}
747747
};
748748
}

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,11 @@
4747
*/
4848
public class MySQLLegacySqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAstTranslator<T> {
4949

50-
public MySQLLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
50+
private final MySQLLegacyDialect dialect;
51+
52+
public MySQLLegacySqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MySQLLegacyDialect dialect) {
5153
super( sessionFactory, statement );
54+
this.dialect = dialect;
5255
}
5356

5457
@Override
@@ -365,7 +368,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
365368

366369
@Override
367370
public MySQLLegacyDialect getDialect() {
368-
return (MySQLLegacyDialect) super.getDialect();
371+
return dialect;
369372
}
370373

371374
@Override

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
772772
@Override
773773
protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
774774
SessionFactoryImplementor sessionFactory, Statement statement) {
775-
return new SingleStoreSqlAstTranslator<>( sessionFactory, statement );
775+
return new SingleStoreSqlAstTranslator<>( sessionFactory, statement, SingleStoreDialect.this );
776776
}
777777
};
778778
}

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SingleStoreSqlAstTranslator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public class SingleStoreSqlAstTranslator<T extends JdbcOperation> extends Abstra
5151

5252
private final SingleStoreDialect dialect;
5353

54-
public SingleStoreSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
54+
public SingleStoreSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, SingleStoreDialect dialect) {
5555
super( sessionFactory, statement );
56-
this.dialect = (SingleStoreDialect) super.getDialect();
56+
this.dialect = dialect;
5757
}
5858

5959
@Override
@@ -396,7 +396,7 @@ protected void renderBackslashEscapedLikePattern(
396396

397397
@Override
398398
public SingleStoreDialect getDialect() {
399-
return this.dialect;
399+
return dialect;
400400
}
401401

402402
private boolean supportsWindowFunctions() {

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
114114
@Override
115115
protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
116116
SessionFactoryImplementor sessionFactory, Statement statement) {
117-
return new TiDBSqlAstTranslator<>( sessionFactory, statement );
117+
return new TiDBSqlAstTranslator<>( sessionFactory, statement, TiDBDialect.this );
118118
}
119119
};
120120
}

‎hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TiDBSqlAstTranslator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ public class TiDBSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlAs
5151

5252
private final TiDBDialect dialect;
5353

54-
public TiDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
54+
public TiDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, TiDBDialect dialect) {
5555
super( sessionFactory, statement );
56-
this.dialect = (TiDBDialect) super.getDialect();
56+
this.dialect = dialect;
5757
}
5858

5959
@Override
@@ -327,7 +327,7 @@ protected String getForShare(int timeoutMillis) {
327327

328328
@Override
329329
public TiDBDialect getDialect() {
330-
return this.dialect;
330+
return dialect;
331331
}
332332

333333
@Override

‎hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
212212
@Override
213213
protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
214214
SessionFactoryImplementor sessionFactory, Statement statement) {
215-
return new MariaDBSqlAstTranslator<>( sessionFactory, statement );
215+
return new MariaDBSqlAstTranslator<>( sessionFactory, statement, MariaDBDialect.this );
216216
}
217217
};
218218
}

‎hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ public SqlAstTranslatorFactory getSqlAstTranslatorFactory() {
731731
@Override
732732
protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
733733
SessionFactoryImplementor sessionFactory, Statement statement) {
734-
return new MySQLSqlAstTranslator<>( sessionFactory, statement );
734+
return new MySQLSqlAstTranslator<>( sessionFactory, statement, MySQLDialect.this );
735735
}
736736
};
737737
}

‎hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ public class MariaDBSqlAstTranslator<T extends JdbcOperation> extends AbstractSq
4848

4949
private final MariaDBDialect dialect;
5050

51-
public MariaDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
51+
public MariaDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MariaDBDialect dialect) {
5252
super( sessionFactory, statement );
53-
this.dialect = (MariaDBDialect) super.getDialect();
53+
this.dialect = dialect;
5454
}
5555

5656
@Override
@@ -384,7 +384,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
384384

385385
@Override
386386
public MariaDBDialect getDialect() {
387-
return this.dialect;
387+
return dialect;
388388
}
389389

390390
private boolean supportsWindowFunctions() {

‎hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java

+5-16
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
import org.hibernate.sql.ast.tree.select.QuerySpec;
3636
import org.hibernate.sql.ast.tree.select.SelectStatement;
3737
import org.hibernate.sql.ast.tree.update.UpdateStatement;
38-
import org.hibernate.sql.exec.internal.JdbcOperationQueryInsertImpl;
3938
import org.hibernate.sql.exec.spi.JdbcOperation;
40-
import org.hibernate.sql.exec.spi.JdbcOperationQueryInsert;
4139

4240
import java.util.ArrayList;
4341
import java.util.List;
@@ -55,8 +53,11 @@ public class MySQLSqlAstTranslator<T extends JdbcOperation> extends AbstractSqlA
5553
*/
5654
private static final int MAX_CHAR_SIZE = (1 << 30) - 1;
5755

58-
public MySQLSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
56+
private final MySQLDialect dialect;
57+
58+
public MySQLSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement, MySQLDialect dialect) {
5959
super( sessionFactory, statement );
60+
this.dialect = dialect;
6061
}
6162

6263
public static String getSqlType(CastTarget castTarget, SessionFactoryImplementor factory) {
@@ -229,18 +230,6 @@ protected void renderDmlTargetTableExpression(NamedTableReference tableReference
229230
}
230231
}
231232

232-
@Override
233-
protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
234-
visitInsertStatement( sqlAst );
235-
236-
return new JdbcOperationQueryInsertImpl(
237-
getSql(),
238-
getParameterBinders(),
239-
getAffectedTableNames(),
240-
getUniqueConstraintNameThatMayFail(sqlAst)
241-
);
242-
}
243-
244233
@Override
245234
protected void visitConflictClause(ConflictClause conflictClause) {
246235
visitOnDuplicateKeyConflictClause( conflictClause );
@@ -426,7 +415,7 @@ public void visitLikePredicate(LikePredicate likePredicate) {
426415

427416
@Override
428417
public MySQLDialect getDialect() {
429-
return (MySQLDialect) super.getDialect();
418+
return dialect;
430419
}
431420

432421
@Override

0 commit comments

Comments
 (0)