minor improvements and corrections
This commit is contained in:
@ -7,7 +7,6 @@ import java.sql.PreparedStatement;
|
|||||||
import java.sql.ResultSet;
|
import java.sql.ResultSet;
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import org.hibernate.HibernateException;
|
|
||||||
import org.hibernate.usertype.UserType;
|
import org.hibernate.usertype.UserType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -41,28 +40,27 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object assemble(Serializable cached, Object owner)
|
public Object assemble(Serializable cached, Object owner) {
|
||||||
throws HibernateException {
|
|
||||||
return cached;
|
return cached;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object deepCopy(Object obj) throws
|
public Object deepCopy(Object obj) {
|
||||||
HibernateException {
|
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Serializable disassemble(Object obj) throws
|
public Serializable disassemble(Object obj) {
|
||||||
HibernateException {
|
|
||||||
return (Serializable) obj;
|
return (Serializable) obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object obj1, Object obj2) throws HibernateException {
|
public boolean equals(Object obj1, Object obj2) {
|
||||||
if (obj1 == null && obj2 == null) {
|
if (obj1 == null && obj2 == null) {
|
||||||
return true;
|
return true;
|
||||||
} else if (obj1 != null && obj2 == null) {
|
} else if (obj1 == null) {
|
||||||
|
return false;
|
||||||
|
} else if (obj2 == null) {
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
return obj1.equals(obj2);
|
return obj1.equals(obj2);
|
||||||
@ -70,7 +68,7 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int hashCode(Object obj) throws HibernateException {
|
public int hashCode(Object obj) {
|
||||||
return obj.hashCode();
|
return obj.hashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -79,7 +77,7 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws HibernateException, SQLException {
|
public Object nullSafeGet(ResultSet rs, String[] names, Object owner) throws SQLException {
|
||||||
String value = rs.getString(names[0]);
|
String value = rs.getString(names[0]);
|
||||||
if (!rs.wasNull()) {
|
if (!rs.wasNull()) {
|
||||||
return enumMap.get(value);
|
return enumMap.get(value);
|
||||||
@ -87,7 +85,7 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void nullSafeSet(PreparedStatement ps, Object obj, int index) throws HibernateException, SQLException {
|
public void nullSafeSet(PreparedStatement ps, Object obj, int index) throws SQLException {
|
||||||
if (obj == null) {
|
if (obj == null) {
|
||||||
ps.setNull(index, sqlType);
|
ps.setNull(index, sqlType);
|
||||||
} else {
|
} else {
|
||||||
@ -96,8 +94,7 @@ public abstract class GenericEnumType<T, E extends Enum<E>> implements UserType,
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Object replace(Object original, Object target, Object owner)
|
public Object replace(Object original, Object target, Object owner) {
|
||||||
throws HibernateException {
|
|
||||||
return original;
|
return original;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user