HHH-19365 - fixed CodeQL

Author: SweetWuXiaoMei

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBAbstractStructuredJdbcType.java

@@ -375,8 +375,7 @@ private int deserializeStruct(
 														string,
 														start,
 														i
-												),
-												jdbcMapping.getJdbcJavaType()
+												)
 										),
 										options
 								);
@@ -765,8 +764,7 @@ private int deserializeArray(
 																string,
 																start,
 																i
-														),
-														elementType.getJdbcJavaType()
+														)
 												),
 												options
 										)
@@ -1001,14 +999,14 @@ private SelectableMapping getJdbcValueSelectable(int jdbcValueSelectableIndex) {
 			int count = 0;
 			for ( int i = 0; i < size; i++ ) {
 				final ValuedModelPart modelPart = getEmbeddedPart( embeddableMappingType, orderMapping[i] );
-				if ( modelPart.getMappedType() instanceof EmbeddableMappingType embeddableMappingType ) {
-					final SelectableMapping aggregateMapping = embeddableMappingType.getAggregateMapping();
+				if ( modelPart.getMappedType() instanceof EmbeddableMappingType nestEmbeddableMappingType ) {
+					final SelectableMapping aggregateMapping = nestEmbeddableMappingType.getAggregateMapping();
 					if ( aggregateMapping == null ) {
-						final SelectableMapping subSelectable = embeddableMappingType.getJdbcValueSelectable( jdbcValueSelectableIndex - count );
+						final SelectableMapping subSelectable = nestEmbeddableMappingType.getJdbcValueSelectable( jdbcValueSelectableIndex - count );
 						if ( subSelectable != null ) {
 							return subSelectable;
 						}
-						count += embeddableMappingType.getJdbcValueCount();
+						count += nestEmbeddableMappingType.getJdbcValueCount();
 					}
 					else {
 						if ( count == jdbcValueSelectableIndex ) {
@@ -1110,7 +1108,7 @@ private Object parseTime(CharSequence subSequence) {
 		return DateTimeFormatter.ISO_LOCAL_TIME.parse( subSequence, LocalTime::from );
 	}
 
-	private Object parseTimestamp(CharSequence subSequence, JavaType<?> jdbcJavaType) {
+	private Object parseTimestamp(CharSequence subSequence) {
 		final TemporalAccessor temporalAccessor = LOCAL_DATE_TIME.parse( subSequence );
 		final LocalDateTime localDateTime = LocalDateTime.from( temporalAccessor );
 		final Timestamp timestamp = Timestamp.valueOf( localDateTime );
@@ -1257,7 +1255,7 @@ private void serializeConvertedBasicTo(
 			case SqlTypes.DECIMAL:
 			case SqlTypes.NUMERIC:
 			case SqlTypes.DURATION:
-				appender.append( subValue.toString() );
+				appender.append( subValue != null ? subValue.toString() : "");
 				break;
 			case SqlTypes.CHAR:
 			case SqlTypes.NCHAR:
@@ -1306,7 +1304,7 @@ private void serializeConvertedBasicTo(
 				);
 				break;
 			case SqlTypes.UUID:
-				appender.append( subValue.toString() );
+				appender.append( subValue != null ? subValue.toString() : "");
 				break;
 			case SqlTypes.ARRAY:
 				if ( subValue != null ) {

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/GaussDBDialect.java

@@ -778,7 +778,14 @@ public ViolatedConstraintNameExtractor getViolatedConstraintNameExtractor() {
 			new TemplatedViolatedConstraintNameExtractor( sqle -> {
 				final String sqlState = JdbcExceptionHelper.extractSqlState( sqle );
 				if ( sqlState != null ) {
-					switch ( Integer.parseInt( sqlState ) ) {
+					int state;
+					try {
+						state = Integer.parseInt(sqlState);
+					}
+					catch (NumberFormatException e) {
+						state = 23001; // or some default value
+					}
+					switch ( state ) {
 						// CHECK VIOLATION
 						case 23514:
 							return extractUsingTemplate( "violates check constraint \"", "\"", sqle.getMessage() );
@@ -1207,13 +1214,13 @@ public void augmentRecognizedTableTypes(List<String> tableTypesList) {
 	@Override
 	public void contributeTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
 		super.contributeTypes(typeContributions, serviceRegistry);
-		contributeGaussDBTypes( typeContributions, serviceRegistry);
+		contributeGaussDBTypes( typeContributions);
 	}
 
 	/**
 	 * Allow for extension points to override this only
 	 */
-	protected void contributeGaussDBTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+	protected void contributeGaussDBTypes(TypeContributions typeContributions) {
 		final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration()
 				.getJdbcTypeRegistry();
 		// For how BLOB affects Hibernate, see:

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/aggregate/GaussDBAggregateSupport.java

@@ -7,7 +7,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.aggregate.AggregateSupport;
 import org.hibernate.dialect.aggregate.AggregateSupportImpl;
 import org.hibernate.internal.util.StringHelper;
@@ -61,7 +60,7 @@ public class GaussDBAggregateSupport extends AggregateSupportImpl {
 	private static final String XML_QUERY_SEPARATOR = "' passing ";
 	private static final String XML_QUERY_END = " columns v xml path '.')t)";
 
-	public static AggregateSupport valueOf(Dialect dialect) {
+	public static AggregateSupport valueOf() {
 		return GaussDBAggregateSupport.INSTANCE;
 	}