import java.util.List;
+import javax.annotation.Nonnull;
+
import org.akraino.validation.ui.dao.TimeslotDAO;
import org.akraino.validation.ui.entity.Timeslot;
import org.hibernate.Criteria;
@Override
public List<Timeslot> getTimeslots() {
Criteria criteria = getSession().createCriteria(Timeslot.class);
+ criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
return criteria.list();
}
@Override
- public Timeslot getTimeslot(Integer timeslotId) {
+ public Timeslot getTimeslot(@Nonnull Integer timeslotId) {
Criteria criteria = getSession().createCriteria(Timeslot.class);
- criteria.add(Restrictions.eq("id", String.valueOf(timeslotId)));
- return criteria.list() == null ? null : (Timeslot) criteria.list().get(0);
+ criteria.setResultTransformer(Criteria.DISTINCT_ROOT_ENTITY);
+ criteria.add(Restrictions.eq("id", timeslotId));
+ return criteria.list() == null || criteria.list().size() < 1 ? null : (Timeslot) criteria.list().get(0);
}
@Override
- public void saveOrUpdate(Timeslot timeslot) {
+ public void saveOrUpdate(@Nonnull Timeslot timeslot) {
getSession().saveOrUpdate(timeslot);
+ getSession().flush();
}
@Override
- public void merge(Timeslot timeslot) {
+ public void merge(@Nonnull Timeslot timeslot) {
getSession().merge(timeslot);
+ getSession().flush();
}
@Override
- public void deleteTimeslot(Timeslot timeslot) {
+ public void deleteTimeslot(@Nonnull Timeslot timeslot) {
getSession().delete(timeslot);
+ getSession().flush();
}
@Override
public void deleteAll() {
if (getSession().createQuery("delete from Timeslot").executeUpdate() > 0) {
LOGGER.info(EELFLoggerDelegate.applicationLogger, "All timeslot entries are cleaned up");
+ getSession().flush();
}
}