HHH-15634 Extracting reusable Type constants from ByteBuddy InlineDirtyCheckingHandler

Author: Sanne

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/InlineDirtyCheckingHandler.java

@@ -32,6 +32,11 @@
 
 final class InlineDirtyCheckingHandler implements Implementation, ByteCodeAppender {
 
+	private static final String HELPER_TYPE_NAME = Type.getInternalName( InlineDirtyCheckerEqualsHelper.class );
+	private static final Type PE_INTERCEPTABLE_TYPE = Type.getType( PersistentAttributeInterceptable.class );
+	private static final Type OBJECT_TYPE = Type.getType( Object.class );
+	private static final Type STRING_TYPE = Type.getType( String.class );
+
 	private final Implementation delegate;
 
 	private final TypeDescription managedCtClass;
@@ -137,31 +142,32 @@ public Size apply(
 		int branchCode;
 		if ( applyLazyCheck ) {
 			if ( persistentField.getType().isPrimitive() ) {
+				final Type fieldType = Type.getType( persistentField.getDescriptor() );
 				methodVisitor.visitMethodInsn(
 						Opcodes.INVOKESTATIC,
-						Type.getInternalName( InlineDirtyCheckerEqualsHelper.class ),
+						HELPER_TYPE_NAME,
 						"areEquals",
 						Type.getMethodDescriptor(
-								Type.getType( boolean.class ),
-								Type.getType( PersistentAttributeInterceptable.class ),
-								Type.getType( String.class ),
-								Type.getType( persistentField.getDescriptor() ),
-								Type.getType( persistentField.getDescriptor() )
+								Type.BOOLEAN_TYPE,
+								PE_INTERCEPTABLE_TYPE,
+								STRING_TYPE,
+								fieldType,
+								fieldType
 						),
 						false
 				);
 			}
 			else {
 				methodVisitor.visitMethodInsn(
 						Opcodes.INVOKESTATIC,
-						Type.getInternalName( InlineDirtyCheckerEqualsHelper.class ),
+						HELPER_TYPE_NAME,
 						"areEquals",
 						Type.getMethodDescriptor(
-								Type.getType( boolean.class ),
-								Type.getType( PersistentAttributeInterceptable.class ),
-								Type.getType( String.class ),
-								Type.getType( Object.class ),
-								Type.getType( Object.class )
+								Type.BOOLEAN_TYPE,
+								PE_INTERCEPTABLE_TYPE,
+								STRING_TYPE,
+								OBJECT_TYPE,
+								OBJECT_TYPE
 						),
 						false
 				);
@@ -190,9 +196,9 @@ else if ( persistentField.getType().represents( double.class ) ) {
 						Type.getInternalName( Objects.class ),
 						"deepEquals",
 						Type.getMethodDescriptor(
-								Type.getType( boolean.class ),
-								Type.getType( Object.class ),
-								Type.getType( Object.class )
+								Type.BOOLEAN_TYPE,
+								OBJECT_TYPE,
+								OBJECT_TYPE
 						),
 						false
 				);
@@ -208,7 +214,7 @@ else if ( persistentField.getType().represents( double.class ) ) {
 				Opcodes.INVOKEVIRTUAL,
 				managedCtClass.getInternalName(),
 				EnhancerConstants.TRACKER_CHANGER_NAME,
-				Type.getMethodDescriptor( Type.getType( void.class ), Type.getType( String.class ) ),
+				Type.getMethodDescriptor( Type.VOID_TYPE, STRING_TYPE ),
 				false
 		);
 		// }