HHH-8283 missed a few commits

hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/Date3Type.java

@@ -0,0 +1,145 @@
+package org.hibernate.ejb.criteria.basic;
+
+import java.io.Serializable;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import org.hibernate.HibernateException;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.Type;
+import org.hibernate.usertype.CompositeUserType;
+
+/**
+ * @author Francois Gerodez
+ */
+public class Date3Type implements CompositeUserType {
+
+	@Override
+	public String[] getPropertyNames() {
+		return new String[] { "year", "month", "day" };
+	}
+
+	@Override
+	public Type[] getPropertyTypes() {
+		return new Type[] { StandardBasicTypes.INTEGER, StandardBasicTypes.INTEGER, StandardBasicTypes.INTEGER };
+	}
+
+	@Override
+	public Object getPropertyValue(Object component, int property) throws HibernateException {
+		Date date = (Date) component;
+		Calendar c = GregorianCalendar.getInstance();
+		c.setTime( date );
+
+		switch ( property ) {
+			case 0:
+				return c.get( Calendar.YEAR );
+			case 1:
+				return c.get( Calendar.MONTH );
+			case 2:
+				return c.get( Calendar.DAY_OF_MONTH );
+		}
+
+		throw new HibernateException( "Invalid property provided" );
+	}
+
+	@Override
+	public void setPropertyValue(Object component, int property, Object value) throws HibernateException {
+		Date date = (Date) component;
+		Calendar c = GregorianCalendar.getInstance();
+		c.setTime( date );
+
+		switch ( property ) {
+			case 0:
+				c.set( Calendar.YEAR, (Integer) value );
+			case 1:
+				c.set( Calendar.MONTH, (Integer) value );
+			case 2:
+				c.set( Calendar.DAY_OF_MONTH, (Integer) value );
+			default:
+				throw new HibernateException( "Invalid property provided" );
+		}
+	}
+
+	@Override
+	public Class returnedClass() {
+		return Date.class;
+	}
+
+	@Override
+	public boolean equals(Object x, Object y) throws HibernateException {
+		if ( x == y )
+			return true;
+		if ( x == null || y == null )
+			return false;
+		Date dx = (Date) x;
+		Date dy = (Date) y;
+
+		return dx.equals( dy );
+	}
+
+	@Override
+	public int hashCode(Object x) throws HibernateException {
+		Date dx = (Date) x;
+		return dx.hashCode();
+	}
+
+	@Override
+	public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner) throws HibernateException, SQLException {
+		Date date = new Date();
+		Calendar c = GregorianCalendar.getInstance();
+		c.setTime( date );
+
+		Integer year = StandardBasicTypes.INTEGER.nullSafeGet( rs, names[0], session );
+		Integer month = StandardBasicTypes.INTEGER.nullSafeGet( rs, names[1], session );
+		Integer day = StandardBasicTypes.INTEGER.nullSafeGet( rs, names[2], session );
+
+		c.set( year, month, day );
+
+		return date;
+	}
+
+	@Override
+	public void nullSafeSet(PreparedStatement st, Object value, int index, SessionImplementor session) throws HibernateException, SQLException {
+		Date date = new Date();
+		Calendar c = GregorianCalendar.getInstance();
+		c.setTime( date );
+
+		StandardBasicTypes.INTEGER.nullSafeSet( st, c.get( Calendar.YEAR ), index, session );
+		StandardBasicTypes.INTEGER.nullSafeSet( st, c.get( Calendar.MONTH ), index + 1, session );
+		StandardBasicTypes.INTEGER.nullSafeSet( st, c.get( Calendar.DAY_OF_MONTH ), index + 2, session );
+	}
+
+	@Override
+	public Object deepCopy(Object value) throws HibernateException {
+		if ( value == null )
+			return null;
+
+		Date date = (Date) value;
+		return date.clone();
+	}
+
+	@Override
+	public boolean isMutable() {
+		return true;
+	}
+
+	@Override
+	public Serializable disassemble(Object value, SessionImplementor session) throws HibernateException {
+		return (Serializable) deepCopy( value );
+	}
+
+	@Override
+	public Object assemble(Serializable cached, SessionImplementor session, Object owner) throws HibernateException {
+		return deepCopy( cached );
+	}
+
+	@Override
+	public Object replace(Object original, Object target, SessionImplementor session, Object owner) throws HibernateException {
+		return deepCopy( original ); // TODO: improve
+	}
+}

hibernate-entitymanager/src/test/java/org/hibernate/ejb/criteria/basic/Payment.java

@@ -0,0 +1,55 @@
+package org.hibernate.ejb.criteria.basic;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Column;
+
+import org.hibernate.annotations.Columns;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
+
+/**
+ * @author Francois Gerodez
+ */
+@Entity
+@Table(name = "crit_basic_payment")
+@TypeDef(name = "paymentDate", typeClass = Date3Type.class)
+public class Payment {
+
+	private Long id;
+	private BigDecimal amount;
+	private Date date;
+
+	@Id
+	@GeneratedValue
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	@Type(type = "paymentDate")
+	@Columns(columns = { @Column(name = "YEARPAYMENT"), @Column(name = "MONTHPAYMENT"), @Column(name = "DAYPAYMENT") })
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+}