diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java index 245667eb261b..b9e7d3432ed4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java @@ -865,7 +865,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { // 461 - foreign key constraint violation // 462 - failed on update or delete by foreign key constraint violation if ( errorCode == 287 || errorCode == 301 || errorCode == 461 || errorCode == 462 ) { - final String constraintName = getViolatedConstraintNameExtracter() + final String constraintName = getViolatedConstraintNameExtractor() .extractConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/CacheDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/CacheDialect.java index a5b510b61baa..da41fddee2a4 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/CacheDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/CacheDialect.java @@ -325,7 +325,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { if ( sqlStateClassCode != null ) { int errorCode = JdbcExceptionHelper.extractErrorCode( sqlException ); if ( errorCode >= 119 && errorCode <= 127 && errorCode != 126 ) { - final String constraintName = getViolatedConstraintNameExtracter().extractConstraintName(sqlException); + final String constraintName = getViolatedConstraintNameExtractor().extractConstraintName(sqlException); return new ConstraintViolationException( message, sqlException, sql, constraintName ); } @@ -340,7 +340,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 753e24eb0302..d8bd6744c603 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -1805,7 +1805,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { private static final ViolatedConstraintNameExtractor EXTRACTOR = sqle -> null; - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java index 9a85a704a754..e756eee23c6e 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java @@ -7,7 +7,6 @@ package org.hibernate.dialect; import org.hibernate.HibernateException; -import org.hibernate.JDBCException; import org.hibernate.NotYetImplementedFor6Exception; import org.hibernate.cfg.Environment; import org.hibernate.dialect.function.CommonFunctionFactory; @@ -511,7 +510,7 @@ public String translateDatetimeFormat(String format) { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } @@ -575,7 +574,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { // *no error name* (Operation violates CHECK constraint {0} on view or table) case 335544665: // isc_unique_key_violation (violation of PRIMARY or UNIQUE KEY constraint "{0}" on table "{1}") - final String constraintName = getViolatedConstraintNameExtracter().extractConstraintName( + final String constraintName = getViolatedConstraintNameExtractor().extractConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); } @@ -585,7 +584,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { if ( exceptionMessage != null ) { if ( exceptionMessage.contains( "violation of " ) || exceptionMessage.contains( "violates CHECK constraint" ) ) { - final String constraintName = getViolatedConstraintNameExtracter().extractConstraintName( + final String constraintName = getViolatedConstraintNameExtractor().extractConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java index e01c896c13c7..918d99fc1628 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java @@ -38,8 +38,6 @@ import org.hibernate.tool.schema.extract.spi.SequenceInformationExtractor; import org.jboss.logging.Logger; -import java.sql.SQLException; - import static org.hibernate.query.TemporalUnit.SECOND; /** @@ -244,7 +242,7 @@ public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy( } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } @@ -276,7 +274,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { return new PessimisticLockException(message, sqlException, sql); case 90006: // NULL not allowed for column [90006-145] - final String constraintName = getViolatedConstraintNameExtracter().extractConstraintName(sqlException); + final String constraintName = getViolatedConstraintNameExtractor().extractConstraintName(sqlException); return new ConstraintViolationException(message, sqlException, sql, constraintName); } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java index 075d70c00b2a..0205eb6a1891 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java @@ -327,7 +327,7 @@ public String getFromDual() { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return version < 200 ? EXTRACTOR_18 : EXTRACTOR_20; } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java index bc9d455c0d1f..3eea76b4994d 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java @@ -271,7 +271,7 @@ public String getFromDual() { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java index ec5a134137e6..a09f3278be12 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java @@ -381,8 +381,8 @@ public SequenceSupport getSequenceSupport() { return NoSequenceSupport.INSTANCE; } - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { - return getVersion() < 500 ? super.getViolatedConstraintNameExtracter() : EXTRACTOR; + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { + return getVersion() < 500 ? super.getViolatedConstraintNameExtractor() : EXTRACTOR; } private static final ViolatedConstraintNameExtractor EXTRACTOR = diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java index 244637725f3b..b461ecbe6dec 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java @@ -704,7 +704,7 @@ public String getSelectGUIDString() { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } @@ -760,7 +760,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { case 1407: // ORA-01407: cannot update column to NULL - final String constraintName = getViolatedConstraintNameExtracter().extractConstraintName( sqlException ); + final String constraintName = getViolatedConstraintNameExtractor().extractConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); default: diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java index dceae2ffccca..485194cb7479 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java @@ -520,7 +520,7 @@ protected String getCreateOptions() { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return EXTRACTOR; } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java index 65d983bd445e..b84a5ecd2d46 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java @@ -21,7 +21,6 @@ import org.hibernate.type.descriptor.sql.SqlTypeDescriptor; import org.hibernate.type.descriptor.sql.TinyIntTypeDescriptor; -import java.sql.SQLException; import java.sql.Types; import java.util.Map; @@ -447,7 +446,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() { case "ZZZZZ": if (515 == errorCode) { // Attempt to insert NULL value into column; column does not allow nulls. - final String constraintName = getViolatedConstraintNameExtracter().extractConstraintName( sqlException ); + final String constraintName = getViolatedConstraintNameExtractor().extractConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); } break; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java index bd61f04150e0..92ea30c73081 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java @@ -409,8 +409,8 @@ public ResultSet getResultSet(CallableStatement cs) throws SQLException { } @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { - return getVersion() < 14 ? super.getViolatedConstraintNameExtracter() : EXTRACTOR; + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { + return getVersion() < 14 ? super.getViolatedConstraintNameExtractor() : EXTRACTOR; } private static ViolatedConstraintNameExtractor EXTRACTOR = diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java index 495ee77d6b29..c94a0d55064d 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java @@ -85,7 +85,7 @@ public Connection createConnection() { private final SQLStateConversionDelegate sqlStateDelegate = new SQLStateConversionDelegate( () -> { // this should never happen... - throw new HibernateException( "Unexpected call to org.hibernate.exception.spi.ConversionContext.getViolatedConstraintNameExtracter" ); + throw new HibernateException( "Unexpected call to ConversionContext.getViolatedConstraintNameExtractor" ); } ); diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java index f817ba3c5030..7d0ef4acdd67 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java @@ -56,7 +56,7 @@ else if ( SQLIntegrityConstraintViolationException.class.isInstance( sqlExceptio message, sqlException, sql, - getConversionContext().getViolatedConstraintNameExtracter().extractConstraintName( sqlException ) + getConversionContext().getViolatedConstraintNameExtractor().extractConstraintName( sqlException ) ); } else if ( SQLSyntaxErrorException.class.isInstance( sqlException ) ) { diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java index 79901cdccfe5..f51a8245419a 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java @@ -104,7 +104,7 @@ public JDBCException convert(SQLException sqlException, String message, String s } else if ( INTEGRITY_VIOLATION_CATEGORIES.contains( sqlStateClassCode ) ) { final String constraintName = getConversionContext() - .getViolatedConstraintNameExtracter() + .getViolatedConstraintNameExtractor() .extractConstraintName( sqlException ); return new ConstraintViolationException( message, sqlException, sql, constraintName ); } diff --git a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java index 1d1ee761e6f6..577687fa6f04 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java @@ -22,7 +22,7 @@ public SQLStateConverter(final ViolatedConstraintNameExtractor extracter) { super(); final ConversionContext conversionContext = new ConversionContext() { @Override - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() { + public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() { return extracter; } }; diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java index b67b9323986b..ff82ca74c71e 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java @@ -10,5 +10,5 @@ * @author Steve Ebersole */ public interface ConversionContext { - public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter(); + ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor(); } diff --git a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java index 529d00b26a84..e3667ebdeb5d 100644 --- a/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java +++ b/hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java @@ -51,7 +51,7 @@ public static SQLExceptionConverter buildSQLExceptionConverter(Dialect dialect, String converterClassName = (String) properties.get( Environment.SQL_EXCEPTION_CONVERTER ); if ( StringHelper.isNotEmpty( converterClassName ) ) { - converter = constructConverter( converterClassName, dialect.getViolatedConstraintNameExtracter() ); + converter = constructConverter( converterClassName, dialect.getViolatedConstraintNameExtractor() ); } if ( converter == null ) { diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java index 401578a1b58b..37399d21bed0 100644 --- a/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java @@ -81,7 +81,7 @@ public void testExtractConstraintName() { SQLException psqlException = new java.sql.SQLException("ERROR: duplicate key value violates unique constraint \"uk_4bm1x2ultdmq63y3h5r3eg0ej\" Detail: Key (username, server_config)=(user, 1) already exists.", "23505"); BatchUpdateException batchUpdateException = new BatchUpdateException("Concurrent Error", "23505", null); batchUpdateException.setNextException(psqlException); - String constraintName = dialect.getViolatedConstraintNameExtracter().extractConstraintName(batchUpdateException); + String constraintName = dialect.getViolatedConstraintNameExtractor().extractConstraintName(batchUpdateException); assertThat(constraintName, is("uk_4bm1x2ultdmq63y3h5r3eg0ej")); }