Skip to content

Remove genericdao #135

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.

Sign up for GitHub

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
ottenhoff wants to merge 3 commits into from
Closed

Remove genericdao #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cba726e
Remove genericdao
ottenhoff Oct 4, 2025
fb8a9d9
readonly methods and merging
ottenhoff Oct 4, 2025
072eb2e
null guard
ottenhoff Oct 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@
<groupId>org.sakaiproject.kernel</groupId>
<artifactId>sakai-kernel-util</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.genericdao</groupId>
<artifactId>generic-dao</artifactId>
</dependency>
<dependency>
<groupId>org.sakaiproject.grading</groupId>
<artifactId>sakai-grading-api</artifactId>
Expand Down
169 changes: 91 additions & 78 deletions impl/src/java/org/sakaiproject/attendance/dao/impl/AttendanceDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ public boolean addAttendanceSite(AttendanceSite aS) {
/**
* {@inheritDoc}
*/
public boolean updateAttendanceSite(AttendanceSite aS) {
try{
getHibernateTemplate().saveOrUpdate(aS);
return true;
} catch (DataAccessException e) {
log.error("updateAttendanceSite aS '" + aS.getSiteID() + "' failed.", e);
return false;
}
}
public boolean updateAttendanceSite(AttendanceSite aS) {
try{
getHibernateTemplate().merge(aS);
return true;
} catch (DataAccessException e) {
log.error("updateAttendanceSite aS '" + aS.getSiteID() + "' failed.", e);
return false;
}
}

/**
* {@inheritDoc}
Expand Down Expand Up @@ -138,17 +138,17 @@ public Serializable addAttendanceEventNow(AttendanceEvent attendanceEvent) {
/**
* {@inheritDoc}
*/
public boolean updateAttendanceEvent(AttendanceEvent aE) {
log.debug("updateAttendanceEvent aE: {}", aE.getName());
public boolean updateAttendanceEvent(AttendanceEvent aE) {
log.debug("updateAttendanceEvent aE: {}", aE.getName());

try{
getHibernateTemplate().saveOrUpdate(aE);
return true;
} catch (DataAccessException e){
log.error("updateAttendanceEvent failed.", e);
return false;
}
}
try{
getHibernateTemplate().merge(aE);
return true;
} catch (DataAccessException e){
log.error("updateAttendanceEvent failed.", e);
return false;
}
}

/**
* {@inheritDoc}
Expand Down Expand Up @@ -196,43 +196,54 @@ public boolean addAttendanceRecord(AttendanceRecord aR) {
/**
* {@inheritDoc}
*/
public boolean updateAttendanceRecord(AttendanceRecord aR) {
try {
getHibernateTemplate().saveOrUpdate(aR);
return true;
} catch (Exception e) {
log.error("update attendanceRecord failed.", e);
return false;
}
}
public boolean updateAttendanceRecord(AttendanceRecord aR) {
try {
// Guard against duplicates on unique key (userID + attendanceEvent)
if (aR.getId() == null && aR.getAttendanceEvent() != null && aR.getUserID() != null) {
AttendanceRecord existing = (AttendanceRecord) getHibernateTemplate().execute(session -> session
.createQuery("from AttendanceRecord r where r.attendanceEvent = :attendanceEvent and r.userID = :userId")
.setParameter("attendanceEvent", aR.getAttendanceEvent())
.setParameter("userId", aR.getUserID())
.uniqueResult());
if (existing != null) {
aR.setId(existing.getId());
}
}
getHibernateTemplate().merge(aR);
return true;
} catch (Exception e) {
log.error("update attendanceRecord failed.", e);
return false;
}
}

/**
* {@inheritDoc}
*/
public void updateAttendanceRecords(List<AttendanceRecord> aRs) {
for(AttendanceRecord aR : aRs) {
try {
getHibernateTemplate().saveOrUpdate(aR);
log.debug("save attendanceRecord id: " + aR.getId());
} catch (Exception e) {
log.error("update attendanceRecords failed.", e);
}
}
}
public void updateAttendanceRecords(List<AttendanceRecord> aRs) {
for(AttendanceRecord aR : aRs) {
try {
updateAttendanceRecord(aR);
log.debug("save attendanceRecord id: " + aR.getId());
} catch (Exception e) {
log.error("update attendanceRecords failed.", e);
}
}
}

/**
* {@inheritDoc}
*/
public void updateAttendanceStatuses(List<AttendanceStatus> attendanceStatusList) {
for(AttendanceStatus aS : attendanceStatusList) {
try {
getHibernateTemplate().saveOrUpdate(aS);
log.debug("AttendanceStatus saved, id: " + aS.getId());
} catch (Exception e) {
log.error("update attendanceStatuses failed.", e);
}
}
}
public void updateAttendanceStatuses(List<AttendanceStatus> attendanceStatusList) {
for(AttendanceStatus aS : attendanceStatusList) {
try {
getHibernateTemplate().merge(aS);
log.debug("AttendanceStatus saved, id: " + aS.getId());
} catch (Exception e) {
log.error("update attendanceStatuses failed.", e);
}
}
}

/**
* {@inheritDoc}
Expand Down Expand Up @@ -342,17 +353,17 @@ public boolean addAttendanceGrade(AttendanceGrade aG) {
/**
* {@inheritDoc}
*/
public boolean updateAttendanceGrade(AttendanceGrade aG) {
log.debug("updateAttendanceGrade for User '{}' grade {} for site {}", aG.getUserID(), aG.getGrade(), aG.getAttendanceSite().getSiteID());
public boolean updateAttendanceGrade(AttendanceGrade aG) {
log.debug("updateAttendanceGrade for User '{}' grade {} for site {}", aG.getUserID(), aG.getGrade(), aG.getAttendanceSite().getSiteID());

try {
getHibernateTemplate().saveOrUpdate(aG);
return true;
} catch (DataAccessException de) {
log.error("updateAttendanceGrade failed.", de);
return false;
}
}
try {
getHibernateTemplate().merge(aG);
return true;
} catch (DataAccessException de) {
log.error("updateAttendanceGrade failed.", de);
return false;
}
}

/**
* {@inheritDoc}
Expand Down Expand Up @@ -393,17 +404,17 @@ public List<AttendanceUserStats> getAttendanceUserStatsForSite(final AttendanceS
/**
* {@inheritDoc}
*/
public boolean updateAttendanceUserStats(AttendanceUserStats aUS) {
log.debug("updateAttendanceUserStats for User '{}' and Site: '{}'.", aUS.getUserID(), aUS.getAttendanceSite().getSiteID());
public boolean updateAttendanceUserStats(AttendanceUserStats aUS) {
log.debug("updateAttendanceUserStats for User '{}' and Site: '{}'.", aUS.getUserID(), aUS.getAttendanceSite().getSiteID());

try {
getHibernateTemplate().saveOrUpdate(aUS);
return true;
} catch (DataAccessException e) {
log.error("updateAttendanceUserStats, id: '{}' failed.", aUS.getId(), e);
return false;
}
}
try {
getHibernateTemplate().merge(aUS);
return true;
} catch (DataAccessException e) {
log.error("updateAttendanceUserStats, id: '{}' failed.", aUS.getId(), e);
return false;
}
}

/**
* {@inheritDoc}
Expand Down Expand Up @@ -455,17 +466,19 @@ public AttendanceItemStats getAttendanceItemStats(AttendanceEvent aE) {
/**
* {@inheritDoc}
*/
public boolean updateAttendanceItemStats(AttendanceItemStats aIS) {
log.debug("updateAttendanceItemStats, '{}', for Event '{}' and site: '{}'.", aIS.getId(), aIS.getAttendanceEvent().getName(), aIS.getAttendanceEvent().getAttendanceSite().getSiteID());
public boolean updateAttendanceItemStats(AttendanceItemStats aIS) {
log.debug("updateAttendanceItemStats, '{}', for Event '{}' and site: '{}'.", aIS.getId(), aIS.getAttendanceEvent().getName(), aIS.getAttendanceEvent().getAttendanceSite().getSiteID());

try {
getHibernateTemplate().saveOrUpdate(aIS);
return true;
} catch (DataAccessException e) {
log.error("updateAttendanceItemStats, '" + aIS.getId() + "' failed.", e);
return false;
}
}
try {
// For shared PK one-to-one (foreign id) mapping, use saveOrUpdate to
// let Hibernate assign id from the associated AttendanceEvent.
getHibernateTemplate().saveOrUpdate(aIS);
return true;
} catch (DataAccessException e) {
log.error("updateAttendanceItemStats, '" + aIS.getId() + "' failed.", e);
return false;
}
}

/**
* {@inheritDoc}
Expand Down
Loading
Loading