remove older getJdbcType() method

documentation/src/test/java/org/hibernate/userguide/mapping/basic/CustomBinaryJdbcType.java

@@ -21,7 +21,7 @@ import org.hibernate.type.descriptor.jdbc.VarbinaryTypeDescriptor;
  */
 public class CustomBinaryJdbcType implements JdbcTypeDescriptor {
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.VARBINARY;
 	}
 

hibernate-core/src/main/java/org/hibernate/dialect/AbstractHANADialect.java

@@ -298,7 +298,7 @@ public abstract class AbstractHANADialect extends Dialect {
 		}
 
 		@Override
-		public int getJdbcType() {
+		public int getJdbcTypeCode() {
 			return Types.BLOB;
 		}
 
@@ -583,7 +583,7 @@ public abstract class AbstractHANADialect extends Dialect {
 		}
 
 		@Override
-		public int getJdbcType() {
+		public int getJdbcTypeCode() {
 			return Types.BLOB;
 		}
 

hibernate-core/src/main/java/org/hibernate/dialect/function/TimestampaddFunction.java

@@ -69,7 +69,7 @@ public class TimestampaddFunction
 		else {
 			final Expression magnitude = (Expression) arguments.get( 1 );
 			final JdbcMapping magnitudeJdbcMapping = magnitude.getExpressionType().getJdbcMappings().get( 0 );
-			switch ( magnitudeJdbcMapping.getJdbcTypeDescriptor().getJdbcType() ) {
+			switch ( magnitudeJdbcMapping.getJdbcTypeDescriptor().getJdbcTypeCode() ) {
 				case Types.INTEGER:
 				case Types.TINYINT:
 				case Types.SMALLINT:

hibernate-core/src/main/java/org/hibernate/procedure/internal/FunctionReturnImpl.java

@@ -32,7 +32,7 @@ public class FunctionReturnImpl implements FunctionReturnImplementor {
 
 	public FunctionReturnImpl(ProcedureCallImplementor procedureCall, AllowableOutputParameterType ormType) {
 		this.procedureCall = procedureCall;
-		this.jdbcTypeCode = ormType.getJdbcTypeDescriptor().getJdbcType();
+		this.jdbcTypeCode = ormType.getJdbcTypeDescriptor().getJdbcTypeCode();
 
 		this.ormType = ormType;
 	}

hibernate-core/src/main/java/org/hibernate/type/PostgresUUIDType.java

@@ -66,7 +66,7 @@ public class PostgresUUIDType extends AbstractSingleColumnStandardBasicType<UUID
 		private static final int JDBC_TYPE_CODE = 3975;
 
 		@Override
-		public int getJdbcType() {
+		public int getJdbcTypeCode() {
 			return JDBC_TYPE_CODE;
 		}
 

hibernate-core/src/main/java/org/hibernate/type/StandardBasicTypeTemplate.java

@@ -29,7 +29,7 @@ public class StandardBasicTypeTemplate<J> extends AbstractSingleColumnStandardBa
 		this.registrationKeys = registrationKeys;
 
 		this.name = javaTypeDescriptor.getJavaType() == null ? "(map-mode)" : javaTypeDescriptor.getJavaType().getTypeName()
-				+ " -> " + jdbcTypeDescriptor.getJdbcType();
+				+ " -> " + jdbcTypeDescriptor.getJdbcTypeCode();
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/descriptor/converter/AttributeConverterJdbcTypeDescriptorAdapter.java

@@ -51,8 +51,8 @@ public class AttributeConverterJdbcTypeDescriptorAdapter implements JdbcTypeDesc
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
-		return delegate.getJdbcType();
+		return delegate.getJdbcTypeCode();
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BigIntTypeDescriptor.java

@@ -32,7 +32,7 @@ public class BigIntTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.BIGINT;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BinaryTypeDescriptor.java

@@ -19,7 +19,7 @@ public class BinaryTypeDescriptor extends VarbinaryTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.BINARY;
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BlobTypeDescriptor.java

@@ -33,7 +33,7 @@ public abstract class BlobTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.BLOB;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/BooleanTypeDescriptor.java

@@ -31,7 +31,7 @@ public class BooleanTypeDescriptor implements JdbcTypeDescriptor {
 	public BooleanTypeDescriptor() {
 	}
 
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.BOOLEAN;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/CharTypeDescriptor.java

@@ -27,7 +27,7 @@ public class CharTypeDescriptor extends VarcharTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.CHAR;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ClobTypeDescriptor.java

@@ -27,7 +27,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
  */
 public abstract class ClobTypeDescriptor implements JdbcTypeDescriptor {
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.CLOB;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DateTypeDescriptor.java

@@ -36,7 +36,7 @@ public class DateTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.DATE;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DecimalTypeDescriptor.java

@@ -33,7 +33,7 @@ public class DecimalTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.DECIMAL;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/DoubleTypeDescriptor.java

@@ -35,7 +35,7 @@ public class DoubleTypeDescriptor implements JdbcTypeDescriptor {
 	 * @return {@link Types#DOUBLE}
 	 */
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.DOUBLE;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/FloatTypeDescriptor.java

@@ -32,7 +32,7 @@ public class FloatTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.FLOAT;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/IntegerTypeDescriptor.java

@@ -32,7 +32,7 @@ public class IntegerTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.INTEGER;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/JdbcTypeDescriptor.java

@@ -33,31 +33,26 @@ public interface JdbcTypeDescriptor extends Serializable {
 	}
 
 	/**
-	 * Return the {@linkplain java.sql.Types JDBC type-code} for the column mapped by this type.
+	 * Return the {@linkplain java.sql.Types JDBC type code} used when interacting
+	 * with JDBC APIs.
 	 *
-	 * @apiNote Prefer {@link #getJdbcTypeCode}
+	 * For example, it's used when calling {@link java.sql.PreparedStatement#setNull(int, int)}.
 	 *
-	 * @return typeCode The JDBC type-code
+	 * @return a JDBC type code
 	 */
-	int getJdbcType();
+	int getJdbcTypeCode();
 
 	/**
-	 * Get the JDBC type code associated with this SQL type descriptor
+	 * Get a JDBC type code that identifies the SQL column type to be used for
+	 * schema generation.
 	 * 
-	 * @see #getJdbcType
+	 * This value is passed to {@link org.hibernate.dialect.Dialect#getTypeName(int)}
-	 */
+	 * to obtain the SQL column type.
-	default int getJdbcTypeCode() {
-		return getJdbcType();
-	}
-
-	/**
-	 * Get a JDBC type code that identifies the SQL column type to be
-	 * used for schema generation.
 	 *
-	 * @see #getJdbcType
+	 * @return a JDBC type code
 	 */
 	default int getDefaultSqlTypeCode() {
-		return getJdbcType();
+		return getJdbcTypeCode();
 	}
 
 	/**

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongNVarcharTypeDescriptor.java

@@ -25,7 +25,7 @@ public class LongNVarcharTypeDescriptor extends NVarcharTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.LONGNVARCHAR;
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarbinaryTypeDescriptor.java

@@ -20,7 +20,7 @@ public class LongVarbinaryTypeDescriptor extends VarbinaryTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.LONGVARBINARY;
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/LongVarcharTypeDescriptor.java

@@ -25,7 +25,7 @@ public class LongVarcharTypeDescriptor extends VarcharTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.LONGVARCHAR;
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NCharTypeDescriptor.java

@@ -25,7 +25,7 @@ public class NCharTypeDescriptor extends NVarcharTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.NCHAR;
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NClobTypeDescriptor.java

@@ -27,7 +27,7 @@ import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
  */
 public abstract class NClobTypeDescriptor implements JdbcTypeDescriptor {
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.NCLOB;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NVarcharTypeDescriptor.java

@@ -32,7 +32,7 @@ public class NVarcharTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.NVARCHAR;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/NumericTypeDescriptor.java

@@ -25,7 +25,7 @@ public class NumericTypeDescriptor extends DecimalTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.NUMERIC;
 	}
 }

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ObjectJdbcTypeDescriptor.java

@@ -35,7 +35,7 @@ public class ObjectJdbcTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return jdbcTypeCode;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/RealTypeDescriptor.java

@@ -26,7 +26,7 @@ public class RealTypeDescriptor extends FloatTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.REAL;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/SmallIntTypeDescriptor.java

@@ -32,7 +32,7 @@ public class SmallIntTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.SMALLINT;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimeTypeDescriptor.java

@@ -36,7 +36,7 @@ public class TimeTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.TIME;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampTypeDescriptor.java

@@ -36,7 +36,7 @@ public class TimestampTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.TIMESTAMP;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TimestampWithTimeZoneDescriptor.java

@@ -35,7 +35,7 @@ public class TimestampWithTimeZoneDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.TIMESTAMP_WITH_TIMEZONE;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/TinyIntTypeDescriptor.java

@@ -35,7 +35,7 @@ public class TinyIntTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.TINYINT;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarbinaryTypeDescriptor.java

@@ -49,7 +49,7 @@ public class VarbinaryTypeDescriptor implements JdbcTypeDescriptor {
 		return "VarbinaryTypeDescriptor";
 	}
 
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.VARBINARY;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/VarcharTypeDescriptor.java

@@ -32,7 +32,7 @@ public class VarcharTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.VARCHAR;
 	}
 

hibernate-core/src/main/java/org/hibernate/type/internal/UserTypeSqlTypeAdapter.java

@@ -47,7 +47,7 @@ public class UserTypeSqlTypeAdapter<J> implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return userType.sqlTypes()[0];
 	}
 

hibernate-core/src/test/java/org/hibernate/jpa/test/query/NativeQueryResultTypeAutoDiscoveryTest.java

@@ -616,7 +616,7 @@ class BitTypeDescriptor implements JdbcTypeDescriptor {
 	public BitTypeDescriptor() {
 	}
 
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.BIT;
 	}
 

hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/binding/annotations/basics/sql/JdbcTypeTests.java

@@ -152,7 +152,7 @@ public class JdbcTypeTests {
 
 	public static class CustomJdbcTypeDescriptor implements JdbcTypeDescriptor {
 		@Override
-		public int getJdbcType() {
+		public int getJdbcTypeCode() {
 			return Types.TINYINT;
 		}
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/AttributeConverterTest.java

@@ -238,7 +238,7 @@ public class AttributeConverterTest extends BaseUnitTestCase {
 			}
 			AbstractStandardBasicType basicType = assertTyping( AbstractStandardBasicType.class, type );
 			assertSame( StringTypeDescriptor.INSTANCE, basicType.getJavaTypeDescriptor() );
-			assertEquals( Types.VARCHAR, basicType.getJdbcTypeDescriptor().getJdbcType() );
+			assertEquals( Types.VARCHAR, basicType.getJdbcTypeDescriptor().getJdbcTypeCode() );
 		}
 		finally {
 			StandardServiceRegistryBuilder.destroy( ssr );

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/CustomTypeConverterTest.java

@@ -63,7 +63,7 @@ public class CustomTypeConverterTest extends BaseUnitTestCase {
 			);
 
 			assertThat(
-					bootTypeConfiguration.getJdbcTypeDescriptorRegistry().getDescriptor( MyCustomJdbcTypeDescriptor.INSTANCE.getJdbcType() ),
+					bootTypeConfiguration.getJdbcTypeDescriptorRegistry().getDescriptor( MyCustomJdbcTypeDescriptor.INSTANCE.getJdbcTypeCode() ),
 					sameInstance( MyCustomJdbcTypeDescriptor.INSTANCE )
 			);
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converted/converter/custom/MyCustomJdbcTypeDescriptor.java

@@ -39,7 +39,7 @@ public class MyCustomJdbcTypeDescriptor implements JdbcTypeDescriptor {
 	}
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		// given the Oracle example above we might want to replace the
 		// handling of VARCHAR
 		return Types.VARCHAR;
@@ -57,7 +57,7 @@ public class MyCustomJdbcTypeDescriptor implements JdbcTypeDescriptor {
 			protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
 				final String valueStr = javaTypeDescriptor.unwrap( value, String.class, options );
 				if ( StringHelper.isBlank( valueStr ) ) {
-					st.setNull( index, getJdbcType() );
+					st.setNull( index, getJdbcTypeCode() );
 				}
 				else {
 					st.setString( index, valueStr );
@@ -68,7 +68,7 @@ public class MyCustomJdbcTypeDescriptor implements JdbcTypeDescriptor {
 			protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) throws SQLException {
 				final String valueStr = javaTypeDescriptor.unwrap( value, String.class, options );
 				if ( StringHelper.isBlank( valueStr ) ) {
-					st.setNull( name, getJdbcType() );
+					st.setNull( name, getJdbcTypeCode() );
 				}
 				else {
 					st.setString( name, valueStr );

hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/QueryParametersValidationArrayTest.java

@@ -96,7 +96,7 @@ public class QueryParametersValidationArrayTest {
 		public static final StringArrayJdbcTypeDescriptor INSTANCE = new StringArrayJdbcTypeDescriptor();
 
 		@Override
-		public int getJdbcType() {
+		public int getJdbcTypeCode() {
 			return Types.ARRAY;
 		}
 

hibernate-core/src/test/java/org/hibernate/orm/test/sql/ast/SmokeTests.java

@@ -184,7 +184,7 @@ public class SmokeTests {
 					assertThat( selectedExpressable, instanceOf( StandardBasicTypeImpl.class ) );
 					final StandardBasicTypeImpl basicType = (StandardBasicTypeImpl) selectedExpressable;
 					assertThat( basicType.getJavaTypeDescriptor().getJavaTypeClass(), AssignableMatcher.assignableTo( Integer.class ) );
-					assertThat( basicType.getJdbcTypeDescriptor().getJdbcType(), is( Types.TINYINT ) );
+					assertThat( basicType.getJdbcTypeDescriptor().getJdbcTypeCode(), is( Types.TINYINT ) );
 
 
 					assertThat( sqlAst.getDomainResultDescriptors().size(), is( 1 ) );

hibernate-core/src/test/java/org/hibernate/test/id/usertype/inet/InetJdbcTypeDescriptor.java

@@ -31,7 +31,7 @@ public class InetJdbcTypeDescriptor implements JdbcTypeDescriptor {
 	public static final InetJdbcTypeDescriptor INSTANCE = new InetJdbcTypeDescriptor();
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.OTHER;
 	}
 

hibernate-core/src/test/java/org/hibernate/test/id/usertype/json/JsonJdbcTypeDescriptor.java

@@ -30,7 +30,7 @@ public class JsonJdbcTypeDescriptor implements JdbcTypeDescriptor {
 	public static final JsonJdbcTypeDescriptor INSTANCE = new JsonJdbcTypeDescriptor();
 
 	@Override
-	public int getJdbcType() {
+	public int getJdbcTypeCode() {
 		return Types.OTHER;
 	}