HHH-19365 - revert format updated code

This reverts commit b2f27c1.

Author: SweetWuXiaoMei

.idea/codeStyles/codeStyleConfig.xml

@@ -1,15 +1,19 @@
 db=h2
+
 # Keep all these properties in sync unless you know what you are doing!
 # We set '-Dlog4j2.disableJmx=true' to prevent classloader leaks triggered by the logger.
 # (Some of these settings need to be repeated in the test.jvmArgs blocks of each module)
 org.gradle.jvmargs=-Dlog4j2.disableJmx -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
 toolchain.compiler.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
 toolchain.javadoc.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
 toolchain.launcher.jvmargs=-Dlog4j2.disableJmx=true -Xmx2g -XX:MaxMetaspaceSize=448m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8
+
 org.gradle.parallel=true
+
 # enable Gradle's Task Cache.  worst case:
 # > rm -rf ~/.gradle/caches/build-cache-1
 org.gradle.caching=true
+
 # JDK auto-detection is not quite ready yet in Gradle 6.7.
 # On Fedora in particular, if you have the package java-1.8.0-openjdk-headless-1.8.0.265.b01-1.fc32.x86_64 installed,
 # Gradle will look for the Java binaries in /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.265.b01-1.fc32.x86_64/bin/java
@@ -20,6 +24,7 @@ org.gradle.java.installations.auto-detect=false
 # We can't rely on Gradle's auto-download of JDKs as it doesn't support EA releases.
 # See https://github.com/gradle/gradle/blob/fc7ea24f3c525d8d12a4346eb0f15976a6be9414/subprojects/platform-jvm/src/main/java/org/gradle/jvm/toolchain/install/internal/AdoptOpenJdkRemoteBinary.java#L114
 org.gradle.java.installations.auto-download=false
+
 # externalized definition of JDK versions so that they are available in both Project (build.gradle) and Settings (settings.gradle)
 orm.jdk.base=17
 orm.jdk.max=22

gradle.properties

@@ -3,7 +3,6 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.dialect;
-
 import java.lang.reflect.Array;
 import java.sql.CallableStatement;
 import java.sql.ResultSet;
@@ -57,39 +56,36 @@
  * is probably not very efficient.
  *
  * @author liubao
- * <p>
+ *
  * Notes: Original code of this class is based on AbstractPostgreSQLStructJdbcType.
  */
 public abstract class AbstractGaussDBStructJdbcType implements StructuredJdbcType {
 
 	private static final DateTimeFormatter LOCAL_DATE_TIME;
-
 	static {
 		LOCAL_DATE_TIME = new DateTimeFormatterBuilder()
 				.parseCaseInsensitive()
-				.append( DateTimeFormatter.ISO_LOCAL_DATE )
-				.appendLiteral( ' ' )
-				.append( DateTimeFormatter.ISO_LOCAL_TIME )
+				.append(DateTimeFormatter.ISO_LOCAL_DATE)
+				.appendLiteral(' ')
+				.append(DateTimeFormatter.ISO_LOCAL_TIME)
 				.optionalStart()
 				.appendOffset( "+HH:mm", "+00" )
 				.toFormatter();
 	}
 
 	// Need a custom formatter for parsing what PostgresPlus/EDB produces
 	private static final DateTimeFormatter LOCAL_DATE;
-
 	static {
 		LOCAL_DATE = new DateTimeFormatterBuilder()
 				.parseCaseInsensitive()
-				.append( DateTimeFormatter.ISO_LOCAL_DATE )
+				.append(DateTimeFormatter.ISO_LOCAL_DATE)
 				.optionalStart()
-				.appendLiteral( ' ' )
-				.append( DateTimeFormatter.ISO_LOCAL_TIME )
+				.appendLiteral(' ')
+				.append(DateTimeFormatter.ISO_LOCAL_TIME)
 				.optionalStart()
 				.appendOffset( "+HH:mm", "+00" )
 				.toFormatter();
 	}
-
 	private final String typeName;
 	private final int[] orderMapping;
 	private final int[] inverseOrderMapping;
@@ -166,7 +162,7 @@ private X getObject(Object object, WrapperOptions options) throws SQLException {
 				if ( object == null ) {
 					return null;
 				}
-				return ((AbstractGaussDBStructJdbcType) getJdbcType()).fromString(
+				return ( (AbstractGaussDBStructJdbcType) getJdbcType() ).fromString(
 						object.toString(),
 						getJavaType(),
 						options
@@ -189,14 +185,12 @@ protected <X> X fromString(String string, JavaType<X> javaType, WrapperOptions o
 			array = values.toArray();
 		}
 		else {
-			array = new Object[embeddableMappingType.getJdbcValueCount() + (embeddableMappingType.isPolymorphic() ? 1
-					: 0)];
+			array = new Object[embeddableMappingType.getJdbcValueCount() + ( embeddableMappingType.isPolymorphic() ? 1 : 0 )];
 			end = deserializeStruct( string, 0, 0, array, returnEmbeddable, options );
 		}
 		assert end == string.length();
 		if ( returnEmbeddable ) {
-			final StructAttributeValues attributeValues = getAttributeValues( embeddableMappingType, orderMapping,
-					array, options );
+			final StructAttributeValues attributeValues = getAttributeValues( embeddableMappingType, orderMapping, array, options );
 			//noinspection unchecked
 			return (X) instantiate( embeddableMappingType, attributeValues );
 		}
@@ -330,15 +324,15 @@ private int deserializeStruct(
 					// Fall-through since a backslash is an escaping mechanism for a start quote within arrays
 				case '"':
 					if ( inQuote ) {
-						if ( isDoubleQuote( string, i, 1 << (quotes + 1) ) ) {
+						if ( isDoubleQuote( string, i, 1 << ( quotes + 1 ) ) ) {
 							// Skip quote escaping as that will be unescaped later
 							if ( escapingSb == null ) {
 								escapingSb = new StringBuilder();
 							}
 							escapingSb.append( string, start, i );
 							escapingSb.append( '"' );
 							// Move forward to the last quote
-							i += (1 << (quotes + 1)) - 1;
+							i += ( 1 << ( quotes + 1 ) ) - 1;
 							start = i + 1;
 							continue;
 						}
@@ -406,7 +400,7 @@ private int deserializeStruct(
 							case SqlTypes.VARBINARY:
 							case SqlTypes.LONGVARBINARY:
 							case SqlTypes.LONG32VARBINARY:
-								final int backslashes = 1 << (quotes + 1);
+								final int backslashes = 1 << ( quotes + 1 );
 								assert repeatsChar( string, start, backslashes, '\\' );
 								final int xCharPosition = start + backslashes;
 								assert string.charAt( xCharPosition ) == 'x';
@@ -475,8 +469,7 @@ private int deserializeStruct(
 											subValues,
 											options
 									);
-									values[column] = instantiate( structJdbcType.embeddableMappingType,
-											attributeValues );
+									values[column] = instantiate( structJdbcType.embeddableMappingType, attributeValues );
 								}
 								else {
 									if ( structJdbcType.inverseOrderMapping != null ) {
@@ -561,7 +554,7 @@ else if ( string.charAt( i + 1 ) == '{' ) {
 								);
 							}
 							else if ( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
-									  && jdbcMapping.getJdbcType().isInteger() ) {
+									&& jdbcMapping.getJdbcType().isInteger() ) {
 								values[column] = fromRawObject(
 										jdbcMapping,
 										IntegerJavaType.INSTANCE.fromEncodedString( string, start, i ),
@@ -597,7 +590,7 @@ else if ( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
 									);
 								}
 								else if ( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
-										  && jdbcMapping.getJdbcType().isInteger() ) {
+										&& jdbcMapping.getJdbcType().isInteger() ) {
 									values[column] = fromRawObject(
 											jdbcMapping,
 											IntegerJavaType.INSTANCE.fromEncodedString( string, start, i ),
@@ -619,8 +612,7 @@ else if ( jdbcMapping.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
 					break;
 				case '{':
 					if ( !inQuote ) {
-						final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) getJdbcValueSelectable(
-								column ).getJdbcMapping();
+						final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) getJdbcValueSelectable( column ).getJdbcMapping();
 						final ArrayList<Object> arrayList = new ArrayList<>();
 						//noinspection unchecked
 						i = deserializeArray(
@@ -718,15 +710,15 @@ private int deserializeArray(
 					// Fall-through since a backslash is an escaping mechanism for a start quote within arrays
 				case '"':
 					if ( inQuote ) {
-						if ( isDoubleQuote( string, i, 1 << (quotes + 1) ) ) {
+						if ( isDoubleQuote( string, i, 1 << ( quotes + 1 ) ) ) {
 							// Skip quote escaping as that will be unescaped later
 							if ( escapingSb == null ) {
 								escapingSb = new StringBuilder();
 							}
 							escapingSb.append( string, start, i );
 							escapingSb.append( '"' );
 							// Move forward to the last quote
-							i += (1 << (quotes + 1)) - 1;
+							i += ( 1 << ( quotes + 1 ) ) - 1;
 							start = i + 1;
 							continue;
 						}
@@ -801,7 +793,7 @@ private int deserializeArray(
 							case SqlTypes.VARBINARY:
 							case SqlTypes.LONGVARBINARY:
 							case SqlTypes.LONG32VARBINARY:
-								final int backslashes = 1 << (quotes + 1);
+								final int backslashes = 1 << ( quotes + 1 );
 								assert repeatsChar( string, start, backslashes, '\\' );
 								final int xCharPosition = start + backslashes;
 								assert string.charAt( xCharPosition ) == 'x';
@@ -912,7 +904,7 @@ private int deserializeArray(
 						case SqlTypes.LONGVARBINARY:
 						case SqlTypes.LONG32VARBINARY:
 							// Skip past the backslashes in the binary literal, this will be handled later
-							final int backslashes = 1 << (quotes + 1);
+							final int backslashes = 1 << ( quotes + 1 );
 							assert repeatsChar( string, start, backslashes, '\\' );
 							i += backslashes;
 							break;
@@ -934,7 +926,7 @@ private int deserializeArray(
 								);
 							}
 							else if ( elementType.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
-									  && elementType.getJdbcType().isInteger() ) {
+									&& elementType.getJdbcType().isInteger() ) {
 								values.add(
 										fromRawObject(
 												elementType,
@@ -973,7 +965,7 @@ else if ( elementType.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
 								);
 							}
 							else if ( elementType.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
-									  && elementType.getJdbcType().isInteger() ) {
+									&& elementType.getJdbcType().isInteger() ) {
 								values.add(
 										fromRawObject(
 												elementType,
@@ -1005,15 +997,14 @@ else if ( elementType.getJavaTypeDescriptor().getJavaTypeClass().isEnum()
 	private SelectableMapping getJdbcValueSelectable(int jdbcValueSelectableIndex) {
 		if ( orderMapping != null ) {
 			final int numberOfAttributeMappings = embeddableMappingType.getNumberOfAttributeMappings();
-			final int size = numberOfAttributeMappings + (embeddableMappingType.isPolymorphic() ? 1 : 0);
+			final int size = numberOfAttributeMappings + ( embeddableMappingType.isPolymorphic() ? 1 : 0 );
 			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 ( aggregateMapping == null ) {
-						final SelectableMapping subSelectable = embeddableMappingType.getJdbcValueSelectable(
-								jdbcValueSelectableIndex - count );
+						final SelectableMapping subSelectable = embeddableMappingType.getJdbcValueSelectable( jdbcValueSelectableIndex - count );
 						if ( subSelectable != null ) {
 							return subSelectable;
 						}
@@ -1055,7 +1046,7 @@ private static boolean isDoubleQuote(String string, int start, int escapes) {
 		if ( escapes == 1 ) {
 			return string.charAt( start ) == '"';
 		}
-		assert (escapes & 1) == 0 : "Only an even number of escapes allowed";
+		assert ( escapes & 1 ) == 0 : "Only an even number of escapes allowed";
 		final int end = start + escapes;
 		if ( end < string.length() ) {
 			for ( ; start < end; start += 2 ) {
@@ -1186,8 +1177,7 @@ protected <X> String toString(X value, JavaType<X> javaType, WrapperOptions opti
 		return sb.toString();
 	}
 
-	private void serializeStructTo(PostgreSQLAppender appender, Object value, WrapperOptions options)
-			throws SQLException {
+	private void serializeStructTo(PostgreSQLAppender appender, Object value, WrapperOptions options) throws SQLException {
 		serializeDomainValueTo( appender, options, value, '(' );
 		appender.append( ')' );
 	}
@@ -1306,7 +1296,7 @@ private void serializeConvertedBasicTo(
 						byte[].class,
 						options
 				);
-				appender.ensureCanFit( appender.quote + 1 + (bytes.length << 1) );
+				appender.ensureCanFit( appender.quote + 1 + ( bytes.length << 1 ) );
 				appender.append( '\\' );
 				appender.append( '\\' );
 				appender.append( 'x' );
@@ -1362,8 +1352,7 @@ private void serializeConvertedBasicTo(
 				}
 				break;
 			default:
-				throw new UnsupportedOperationException(
-						"Unsupported JdbcType nested in struct: " + jdbcMapping.getJdbcType() );
+				throw new UnsupportedOperationException( "Unsupported JdbcType nested in struct: " + jdbcMapping.getJdbcType() );
 		}
 	}
 
@@ -1373,7 +1362,7 @@ private StructAttributeValues getAttributeValues(
 			Object[] rawJdbcValues,
 			WrapperOptions options) throws SQLException {
 		final int numberOfAttributeMappings = embeddableMappingType.getNumberOfAttributeMappings();
-		final int size = numberOfAttributeMappings + (embeddableMappingType.isPolymorphic() ? 1 : 0);
+		final int size = numberOfAttributeMappings + ( embeddableMappingType.isPolymorphic() ? 1 : 0 );
 		final StructAttributeValues attributeValues = new StructAttributeValues(
 				numberOfAttributeMappings,
 				orderMapping != null ?
@@ -1500,8 +1489,7 @@ else if ( value instanceof java.util.Calendar calendar ) {
 					appendAsTimestampWithMillis( appender, calendar, jdbcTimeZone );
 				}
 				else if ( value instanceof TemporalAccessor temporalAccessor ) {
-					appendAsTimestampWithMicros( appender, temporalAccessor,
-							temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ), jdbcTimeZone );
+					appendAsTimestampWithMicros( appender, temporalAccessor, temporalAccessor.isSupported( ChronoField.OFFSET_SECONDS ), jdbcTimeZone );
 				}
 				else {
 					appendAsTimestampWithMicros(
@@ -1517,7 +1505,6 @@ else if ( value instanceof TemporalAccessor temporalAccessor ) {
 
 		appender.append( '"' );
 	}
-
 	private static TimeZone getJdbcTimeZone(WrapperOptions options) {
 		return options == null || options.getJdbcTimeZone() == null
 				? TimeZone.getDefault()