Various code cleanup #9631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

sebersole wants to merge 34 commits into hibernate:main from sebersole:code-cleanups

...te-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/BaseMappedSuperclass.java

-Original file line number
+Diff line change
@@ -0,0 +1,31 @@
+    /*
+     * SPDX-License-Identifier: LGPL-2.1-or-later
+     * Copyright Red Hat Inc. and Hibernate Authors
+     */
+    package org.hibernate.bytecode.internal.bytebuddy;
+    import jakarta.persistence.Id;
+    import jakarta.persistence.MappedSuperclass;
+    @MappedSuperclass
+    public abstract class BaseMappedSuperclass {
+    	@Id
+    	protected Long id;
+    	protected String value;
+    	public Long getId() {
+    		return id;
+    	}
+    	public void setId(Long id) {
+    		this.id = id;
+    	}
+    	public String getValue() {
+    		return value;
+    	}
+    	public void setValue(String value) {
+    		this.value = value;
+    	}
+    }

...ate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/GenerateProxiesTest.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,24 +4,11 @@ @@
      */
     package org.hibernate.bytecode.internal.bytebuddy;
-    import static org.junit.Assert.assertEquals;
     import static org.junit.Assert.assertNotNull;
-    import java.io.IOException;
     import java.lang.reflect.InvocationTargetException;
-    import java.util.LinkedHashMap;
-    import java.util.Map;
-    import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
-    import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
-    import org.hibernate.bytecode.enhance.spi.EnhancementException;
-    import org.hibernate.bytecode.enhance.spi.Enhancer;
-    import org.hibernate.bytecode.spi.ByteCodeHelper;
-    import org.hibernate.bytecode.spi.ReflectionOptimizer;
-    import org.hibernate.property.access.internal.PropertyAccessStrategyFieldImpl;
-    import org.hibernate.property.access.spi.PropertyAccess;
     import org.hibernate.proxy.pojo.bytebuddy.ByteBuddyProxyHelper;
-    import org.hibernate.testing.orm.junit.JiraKey;
     import org.junit.Test;
     public class GenerateProxiesTest {
@@ Expand All @@
     		assertNotNull( proxyClass );
     		assertNotNull( proxyClass.getConstructor().newInstance() );
     	}
-    	@Test
-    	public void generateFastClassAndReflectionOptimizer() {
-    		BytecodeProviderImpl bytecodeProvider = new BytecodeProviderImpl();
-    		ReflectionOptimizer reflectionOptimizer = bytecodeProvider.getReflectionOptimizer( SimpleEntity.class,
-    				new String[]{ "getId", "getName" }, new String[]{ "setId", "setName" },
-    				new Class<?>[]{ Long.class, String.class } );
-    		assertEquals( 2, reflectionOptimizer.getAccessOptimizer().getPropertyNames().length );
-    		assertNotNull( reflectionOptimizer.getInstantiationOptimizer().newInstance() );
-    	}
-    	@Test
-    	@JiraKey("HHH-16772")
-    	public void generateFastMappedSuperclassAndReflectionOptimizer() {
-    		BytecodeProviderImpl bytecodeProvider  = new BytecodeProviderImpl();
-    		final Map<String, PropertyAccess> propertyAccessMap = new LinkedHashMap<>();
-    		final PropertyAccessStrategyFieldImpl propertyAccessStrategy = new PropertyAccessStrategyFieldImpl();
-    		propertyAccessMap.put(
-    				"timestamp",
-    				propertyAccessStrategy.buildPropertyAccess(MappedSuperclassEntity.class, "value", true )
-    		);
-    		ReflectionOptimizer reflectionOptimizer = bytecodeProvider.getReflectionOptimizer(
-    				MappedSuperclassEntity.class,
-    				propertyAccessMap
-    		);
-    		assertNotNull(reflectionOptimizer);
-    		assertEquals( 1, reflectionOptimizer.getAccessOptimizer().getPropertyNames().length );
-    		assertNotNull( reflectionOptimizer.getInstantiationOptimizer().newInstance() );
-    	}
-    	@Test
-    	public void generateEnhancedClass() throws EnhancementException, IOException {
-    		Enhancer enhancer = new EnhancerImpl( new DefaultEnhancementContext(), new ByteBuddyState() );
-    		enhancer.enhance( SimpleEntity.class.getName(),
-    				ByteCodeHelper.readByteCode( SimpleEntity.class.getClassLoader()
-    						.getResourceAsStream( SimpleEntity.class.getName().replace( '.', '/' ) + ".class" ) ) );
-    	}
     }

...-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/MappedSuperclassEntity.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
     package org.hibernate.bytecode.internal.bytebuddy;
     import jakarta.persistence.Entity;
-    import org.hibernate.bytecode.internal.bytebuddy.mappedsuperclass.BaseMappedSuperclass;
     @Entity
     public class MappedSuperclassEntity extends BaseMappedSuperclass {
@@ Expand Down @@

...ore/src/test/java/org/hibernate/bytecode/internal/bytebuddy/ReflectionOptimizerTests.java

-Original file line number
+Diff line change
@@ -0,0 +1,67 @@
+    /*
+     * SPDX-License-Identifier: LGPL-2.1-or-later
+     * Copyright Red Hat Inc. and Hibernate Authors
+     */
+    package org.hibernate.bytecode.internal.bytebuddy;
+    import org.hibernate.bytecode.spi.ReflectionOptimizer;
+    import org.hibernate.testing.orm.junit.JiraKey;
+    import org.junit.Test;
+    import static org.assertj.core.api.Assertions.assertThat;
+    import static org.junit.Assert.assertNotNull;
+    /**
+     * @author Steve Ebersole
+     */
+    public class ReflectionOptimizerTests {
+    	@Test
+    	public void generateFastClassAndReflectionOptimizer() {
+    		BytecodeProviderImpl bytecodeProvider = new BytecodeProviderImpl();
+    		ReflectionOptimizer reflectionOptimizer = bytecodeProvider.getReflectionOptimizer( SimpleEntity.class,
+    				new String[]{ "getId", "getName" }, new String[]{ "setId", "setName" },
+    				new Class<?>[]{ Long.class, String.class } );
+    		assertThat( reflectionOptimizer ).isNotNull();
+    		final ReflectionOptimizer.AccessOptimizer accessOptimizer = reflectionOptimizer.getAccessOptimizer();
+    		assertThat( accessOptimizer.getPropertyNames() ).hasSize( 2 );
+    		final Object instance = reflectionOptimizer.getInstantiationOptimizer().newInstance();
+    		assertNotNull( instance );
+    		final Object[] initialValues = accessOptimizer.getPropertyValues( instance );
+    		assertThat( initialValues ).containsExactly( null, null );
+    		accessOptimizer.setPropertyValues( instance, new Object[] { 1L, "a name" } );
+    		final Object[] injectedValues = accessOptimizer.getPropertyValues( instance );
+    		assertThat( injectedValues ).containsExactly( 1L, "a name" );
+    	}
+    	@Test
+    	@JiraKey("HHH-16772")
+    	public void generateFastMappedSuperclassAndReflectionOptimizer() {
+    		BytecodeProviderImpl bytecodeProvider  = new BytecodeProviderImpl();
+    		ReflectionOptimizer reflectionOptimizer = bytecodeProvider.getReflectionOptimizer(
+    				MappedSuperclassEntity.class,
+    				new String[]{ "getId", "getValue" }, new String[]{ "setId", "setValue" },
+    				new Class<?>[]{ Long.class, String.class }
+    		);
+    		assertThat( reflectionOptimizer ).isNotNull();
+    		final ReflectionOptimizer.AccessOptimizer accessOptimizer = reflectionOptimizer.getAccessOptimizer();
+    		assertThat( accessOptimizer.getPropertyNames() ).hasSize( 2 );
+    		final Object instance = reflectionOptimizer.getInstantiationOptimizer().newInstance();
+    		assertNotNull( instance );
+    		final Object[] initialValues = accessOptimizer.getPropertyValues( instance );
+    		assertThat( initialValues ).containsExactly( null, null );
+    		accessOptimizer.setPropertyValues( instance, new Object[] { 1L, "a value" } );
+    		final Object[] injectedValues = accessOptimizer.getPropertyValues( instance );
+    		assertThat( injectedValues ).containsExactly( 1L, "a value" );
+    	}
+    }

...ate-core/src/test/java/org/hibernate/bytecode/internal/bytebuddy/SimpleEnhancerTests.java

-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    /*
+     * SPDX-License-Identifier: LGPL-2.1-or-later
+     * Copyright Red Hat Inc. and Hibernate Authors
+     */
+    package org.hibernate.bytecode.internal.bytebuddy;
+    import org.hibernate.bytecode.enhance.internal.bytebuddy.EnhancerImpl;
+    import org.hibernate.bytecode.enhance.spi.DefaultEnhancementContext;
+    import org.hibernate.bytecode.enhance.spi.EnhancementException;
+    import org.hibernate.bytecode.enhance.spi.Enhancer;
+    import org.hibernate.bytecode.spi.ByteCodeHelper;
+    import org.junit.Test;
+    import java.io.IOException;
+    /**
+     * @author Steve Ebersole
+     */
+    public class SimpleEnhancerTests {
+    	@Test
+    	public void generateEnhancedClass() throws EnhancementException, IOException {
+    		Enhancer enhancer = new EnhancerImpl( new DefaultEnhancementContext(), new ByteBuddyState() );
+    		enhancer.enhance( SimpleEntity.class.getName(),
+    				ByteCodeHelper.readByteCode( SimpleEntity.class.getClassLoader()
+    						.getResourceAsStream( SimpleEntity.class.getName().replace( '.', '/' ) + ".class" ) ) );
+    	}
+    }

...java/org/hibernate/bytecode/internal/bytebuddy/mappedsuperclass/BaseMappedSuperclass.java

This file was deleted.

hibernate-core/src/test/java/org/hibernate/orm/test/aggregation/UuidAggregationTest.java

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Various code cleanup #9631

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!