HHH-10079 - Use enhanced property access for field/property attributes only

(cherry picked from commit 643c0b532d)

hibernate-core/src/main/java/org/hibernate/property/access/internal/PropertyAccessStrategyResolverStandardImpl.java

@@ -34,7 +34,10 @@ public class PropertyAccessStrategyResolverStandardImpl implements PropertyAcces
 			String explicitAccessStrategyName,
 			EntityMode entityMode) {
 
-		if ( Managed.class.isAssignableFrom( containerClass ) ) {
+		if ( ( BuiltInPropertyAccessStrategies.BASIC.getExternalName().equals( explicitAccessStrategyName ) ||
+				BuiltInPropertyAccessStrategies.FIELD.getExternalName().equals( explicitAccessStrategyName ) ||
+				BuiltInPropertyAccessStrategies.MIXED.getExternalName().equals( explicitAccessStrategyName ) ) &&
+				Managed.class.isAssignableFrom( containerClass ) ) {
 			return PropertyAccessStrategyEnhancedImpl.INSTANCE;
 		}
 

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java

@@ -26,6 +26,7 @@ import org.hibernate.test.bytecode.enhancement.lazy.LazyLoadingTestTask;
 import org.hibernate.test.bytecode.enhancement.lazy.basic.LazyBasicFieldAccessTestTask;
 import org.hibernate.test.bytecode.enhancement.lazy.basic.LazyBasicPropertyAccessTestTask;
 import org.hibernate.test.bytecode.enhancement.merge.CompositeMergeTestTask;
+import org.hibernate.test.bytecode.enhancement.pk.EmbeddedPKTestTask;
 import org.junit.Test;
 
 /**
@@ -64,6 +65,10 @@ public class EnhancerTest extends BaseUnitTestCase {
 		EnhancerTestUtils.runEnhancerTestTask( CompositeMergeTestTask.class );
 	}
 
+	@Test
+	public void testEmbeddedPK() {
+		EnhancerTestUtils.runEnhancerTestTask( EmbeddedPKTestTask.class );
+	}
 
 	@Test
 	public void testFieldAccess() {

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/pk/EmbeddedPKTestTask.java

@@ -0,0 +1,51 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.test.bytecode.enhancement.pk;
+
+
+import org.hibernate.Session;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.cfg.Environment;
+
+import org.hibernate.test.bytecode.enhancement.AbstractEnhancerTestTask;
+
+/**
+ * @author Gail Badner
+ */
+public class EmbeddedPKTestTask extends AbstractEnhancerTestTask {
+
+	private Long entityId;
+
+	public Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[] {WorkOrder.class, WorkOrderPK.class};
+	}
+
+	public void prepare() {
+		Configuration cfg = new Configuration();
+		cfg.setProperty( Environment.ENABLE_LAZY_LOAD_NO_TRANS, "true" );
+		cfg.setProperty( Environment.USE_SECOND_LEVEL_CACHE, "false" );
+		super.prepare( cfg );
+
+		Session s = getFactory().openSession();
+		s.beginTransaction();
+
+		WorkOrder wo = new WorkOrder(  );
+		s.persist( wo );
+
+		s.getTransaction().commit();
+		s.clear();
+		s.close();
+	}
+
+	public void execute() {
+
+	}
+
+	protected void cleanup() {
+	}
+
+}

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/pk/WorkOrder.java

@@ -0,0 +1,252 @@
+/*
+ *   SPECjEnterprise2010 - a benchmark for enterprise middleware
+ *  Copyright 1995-2010 Standard Performance Evaluation Corporation
+ *   All Rights Reserved
+ */
+
+package org.hibernate.test.bytecode.enhancement.pk;
+
+import java.util.Calendar;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Version;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSchemaType;
+
+/**
+ * Represent a work order that evolves through multiple processing stages. 
+ *
+ */
+@SuppressWarnings("serial")
+
+@NamedQueries({
+        @NamedQuery(name=WorkOrder.QUERY_ALL, 
+                   query="select w from WorkOrder w"),
+//        @NamedQuery(name=WorkOrder.QUERY_BY_STATUS,
+//                   query="select w from WorkOrder w where w.status = :status"),
+        @NamedQuery(name=WorkOrder.QUERY_BY_OID_OLID,
+                   query="select w from WorkOrder w where w.location = :location and w.salesId = :salesId and w.orderLineId = :orderLineId"),
+        @NamedQuery(name=WorkOrder.QUERY_COUNT,
+                   query="select COUNT(a) from WorkOrder a")
+})
+
+@Entity
+@Table(name = "M_WORKORDER")
+@XmlAccessorType(XmlAccessType.PROPERTY)
+@IdClass(WorkOrderPK.class)
+public class WorkOrder {
+
+    public static final String QUERY_ALL = "WorkOrder.selectAll";
+    //public static final String QUERY_BY_STATUS = "WorkOrder.selectByStatus";
+    public static final String QUERY_BY_OID_OLID = "WorkOrder.selectByOID_OLID";
+    public static final String QUERY_COUNT = "WorkOrder.count";
+
+    @Id
+    @TableGenerator(name = "workorder", 
+            table = "U_SEQUENCES", 
+            pkColumnName = "S_ID", 
+            valueColumnName = "S_NEXTNUM", 
+            pkColumnValue = "workorder", 
+            allocationSize = 1000)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "workorder")
+    @Column(name = "WO_NUMBER")
+    private int id;
+
+    @Id
+    @Column(name = "WO_LOCATION")
+    private int location;
+    
+    @Column(name = "WO_O_ID")
+    private int salesId;
+
+    @Column(name = "WO_OL_ID")
+    private int orderLineId;
+
+    @Column(name = "WO_ORIG_QTY")
+    private int originalQuantity;
+
+    @Column(name = "WO_COMP_QTY")
+    private int completedQuantity;
+
+    @Column(name = "WO_DUE_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Calendar dueDate;
+
+    @Column(name = "WO_START_DATE")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Calendar startDate;
+
+    @Column(name = "WO_ASSEMBLY_ID")
+    private String assemblyId;
+    
+    @Version
+    @Column(name = "WO_VERSION")
+    private int version;
+
+    /**
+     * Public no-arg constructor required by JAXB specification.
+     */
+    public WorkOrder() {
+    	this("", 1, 0, Calendar.getInstance());
+    }
+    
+    /**
+     * Construct with proper state. The status at construction is OPEN.
+     * @param location
+     */
+    public WorkOrder(String assemblyId, int origQty, int location, Calendar dueDate) {
+        if (origQty < 1)
+            throw new IllegalArgumentException("WorkOrder can not be created " +
+                    " with original quantity " + origQty + ". Must be > 0");
+        if (dueDate == null)
+            throw new IllegalArgumentException("WorkOrder can not be created " +
+                    " with null due Date");
+        this.assemblyId = assemblyId;
+        originalQuantity = origQty;
+        this.dueDate = dueDate;
+        this.location=location;
+    }
+
+    /**
+     * Construct with proper state. The status at construction is OPEN.
+     * @param location
+     */
+    public WorkOrder(String assemblyId, int salesId, int oLineId, int origQty,
+            int location, Calendar dueDate) {
+        this(assemblyId, origQty, location, dueDate);        
+        this.salesId = salesId; 
+        orderLineId = oLineId;
+    }
+
+    public int getId() {
+        return id;
+    }
+    
+    public void setId(int id) {
+    	this.id = id;
+    }
+    
+    public String getAssemblyId() {
+    	return assemblyId;
+    }
+    
+    public int getCompletedQuantity() {
+        return completedQuantity;
+    }
+
+    public void setCompletedQuantity(int compQty) {
+        this.completedQuantity = compQty;
+    }
+
+    public Calendar getDueDate() {
+        return dueDate;
+    }
+
+    public int getOrderLineId() {
+        return orderLineId;
+    }
+
+    public int getOriginalQuantity() {
+        return originalQuantity;
+    }
+   
+    public int getSalesId() {
+        return salesId;
+    }
+    
+    public int getLocation() {
+      return location;
+    }
+
+    @XmlSchemaType(name = "dateTime")
+    public Calendar getStartDate() {
+        return startDate;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    // ======================================================================
+    // Processing methods
+    // ======================================================================
+    /**
+     * Moves to the next state of processing. 
+     * Return true if the new status can be updated again.
+     */
+    public boolean update() {
+        return true;
+    }
+
+    /**
+     * When workOrder is finished, it will add the new object to inventory and
+     * modify the state of workOrder to finished.
+     */
+    public boolean setStatusCompleted() {
+        return true;
+    }
+    
+    public void advanceStatus() {
+    }
+    
+    public void setStatusCancelled() {
+    }
+    
+    public boolean equals(Object other) {
+        if (this == other) 
+            return true;
+        if (other == null || !(other instanceof WorkOrder))
+            return false;
+        return id == ((WorkOrder)other).id;
+    }
+    
+    public int hashCode() {
+        final int PRIME = 31;
+        return PRIME * new Integer(id).hashCode();
+    }
+
+    
+    public String toString() {
+        return "WorkOrder:["+ getId() + "]" ;
+    }
+
+    public void setStartDate(Calendar instance) {
+      startDate = instance;
+    }
+
+	public void setLocation(int location) {
+		this.location = location;
+	}
+
+	public void setDueDate(Calendar dueDate) {
+		this.dueDate = dueDate;
+	}
+
+	public void setAssemblyId(String assemblyId) {
+		this.assemblyId = assemblyId;
+	}
+	
+	public void setOriginalQuantity(int originalQuantity) {
+		this.originalQuantity = originalQuantity;
+	}
+
+	public void setSalesId(int salesId) {
+		this.salesId = salesId;
+	}
+
+	public void setOrderLineId(int orderLineId) {
+		this.orderLineId = orderLineId;
+	}
+
+}

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/pk/WorkOrderPK.java

@@ -0,0 +1,52 @@
+/*
+ *   SPECjEnterprise2010 - a benchmark for enterprise middleware
+ *  Copyright 1995-2010 Standard Performance Evaluation Corporation
+ *   All Rights Reserved
+ *
+ *  History:
+ *  Date        ID, Company             Description
+ *  ----------  ----------------        ----------------------------------------------
+ *  2009/05/31  Anoop Gupta, Oracle     Created for SPECjEnterprise2010
+ */
+
+package org.hibernate.test.bytecode.enhancement.pk;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class WorkOrderPK implements Serializable {
+    private int id;
+    private int location;
+
+    public WorkOrderPK() {
+    }
+
+    public WorkOrderPK(int location, int id) {
+        this.location = location;
+        this.id = id;
+    }
+
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if (!(other instanceof WorkOrderPK)) {
+            return false;
+        }
+        WorkOrderPK wop = (WorkOrderPK) other;
+        return (location == wop.location && id == wop.id);
+    }
+
+    public int hashCode() {
+        return id ^ location;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public int getLocation() {
+        return location;
+    }
+
+}