Skip to content

Commit

Permalink
Also fix spelling error in method name
Browse files Browse the repository at this point in the history 
Caught by @NathanQingyangXu
  • Loading branch information
@gavinking @sebersole
gavinking authored and sebersole committed Apr 20, 2020
1 parent d3d92f9 commit 5e53f21
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 30 deletions.
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java
View file
Expand Up @@ -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 );
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/CacheDialect.java
View file
Expand Up @@ -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 );
}

Expand All @@ -340,7 +340,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
View file
Expand Up @@ -1805,7 +1805,7 @@ public SQLExceptionConversionDelegate buildSQLExceptionConversionDelegate() {

private static final ViolatedConstraintNameExtractor EXTRACTOR = sqle -> null;

public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down
7 changes: 3 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/dialect/FirebirdDialect.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -511,7 +510,7 @@ public String translateDatetimeFormat(String format) {
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down Expand Up @@ -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 );
}
Expand All @@ -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 );
}
Expand Down
6 changes: 2 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
View file
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -244,7 +242,7 @@ public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy(
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/HSQLDialect.java
View file
Expand Up @@ -327,7 +327,7 @@ public String getFromDual() {
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return version < 200 ? EXTRACTOR_18 : EXTRACTOR_20;
}

Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/InformixDialect.java
View file
Expand Up @@ -271,7 +271,7 @@ public String getFromDual() {
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
View file
Expand Up @@ -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 =
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java
View file
Expand Up @@ -704,7 +704,7 @@ public String getSelectGUIDString() {
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
View file
Expand Up @@ -520,7 +520,7 @@ protected String getCreateOptions() {
}

@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return EXTRACTOR;
}

Expand Down
3 changes: 1 addition & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/TeradataDialect.java
View file
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/hibernate/engine/jdbc/connections/internal/BasicConnectionCreator.java
View file
Expand Up @@ -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" );
}
);

Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/exception/internal/SQLExceptionTypeDelegate.java
View file
Expand Up @@ -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 ) ) {
Expand Down
2 changes: 1 addition & 1 deletion ...rnate-core/src/main/java/org/hibernate/exception/internal/SQLStateConversionDelegate.java
View file
Expand Up @@ -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 );
}
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/exception/internal/SQLStateConverter.java
View file
Expand Up @@ -22,7 +22,7 @@ public SQLStateConverter(final ViolatedConstraintNameExtractor extracter) {
super();
final ConversionContext conversionContext = new ConversionContext() {
@Override
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter() {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
return extracter;
}
};
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/exception/spi/ConversionContext.java
View file
Expand Up @@ -10,5 +10,5 @@
* @author Steve Ebersole
*/
public interface ConversionContext {
public ViolatedConstraintNameExtractor getViolatedConstraintNameExtracter();
ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor();
}
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/exception/spi/SQLExceptionConverterFactory.java
View file
Expand Up @@ -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 ) {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/test/java/org/hibernate/dialect/PostgreSQL81DialectTestCase.java
View file
Expand Up @@ -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"));
}

Expand Down

0 comments on commit 5e53f21

Please sign in to comment.