Merge OpenOLAT 8.3 to OpenOLAT default branch with fa515211225eba526fc9d65e34f979655249ead8

.hgtags

@@ -39,3 +39,4 @@ c04c6d0e5c4eb486f95c62846c8f16869752497d OpenOLAT 8.3.3
 c705216e80316b862757515d1a9f0f772393fbc8 OpenOLAT 8.3.4
 c705216e80316b862757515d1a9f0f772393fbc8 OpenOLAT 8.3.4
 138f584995d4a899f812e5a921ba079aed8d9e48 OpenOLAT 8.3.4
+f944e71e243fc3fd4b9af3538049373e7eb692b0 OpenOLAT 8.3.5

src/main/java/org/olat/core/commons/services/commentAndRating/impl/UserCommentsManagerImpl.java

@@ -25,6 +25,9 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+
 import org.olat.core.commons.persistence.DB;
 import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.commons.persistence.DBQuery;
@@ -285,22 +288,37 @@ public class UserCommentsManagerImpl extends UserCommentsManager {
 	public int deleteAllComments() {
 		DB db = DBFactory.getInstance();
 		// special query when sub path is null
+		
+		List<UserCommentImpl> comments;
 		if (getOLATResourceableSubPath() == null) {
 			StringBuilder sb = new StringBuilder();
-			sb.append("delete from ").append(UserCommentImpl.class.getName()).append(" where resName=:resName and resId=:resId and resSubPath is null");
-			return db.getCurrentEntityManager().createQuery(sb.toString())
+			sb.append("select comment from ").append(UserCommentImpl.class.getName()).append(" comment")
+			  .append(" where resName=:resName and resId=:resId and resSubPath is null")
+			  .append(" order by creationDate desc");
+			
+			comments = db.getCurrentEntityManager().createQuery(sb.toString(), UserCommentImpl.class)
 				.setParameter("resName", getOLATResourceable().getResourceableTypeName())
 				.setParameter("resId", getOLATResourceable().getResourceableId())
-				.executeUpdate();
+				.getResultList();
 		} else {
 			StringBuilder sb = new StringBuilder();
-			sb.append("delete from ").append(UserCommentImpl.class.getName()).append(" where resName=:resName and resId=:resId and resSubPath=:resSubPath");
-			return db.getCurrentEntityManager().createQuery(sb.toString())
+			sb.append("select comment from ").append(UserCommentImpl.class.getName()).append(" comment")
+			  .append(" where resName=:resName and resId=:resId and resSubPath=:resSubPath")
+			  .append(" order by creationDate desc");
+			
+			comments = db.getCurrentEntityManager().createQuery(sb.toString(), UserCommentImpl.class)
 					.setParameter("resName", getOLATResourceable().getResourceableTypeName())
 					.setParameter("resId", getOLATResourceable().getResourceableId())
 					.setParameter("resSubPath",  getOLATResourceableSubPath())
-					.executeUpdate();
+					.getResultList();
 		}
+		
+		if(comments != null && !comments.isEmpty()) {
+			for(UserCommentImpl comment:comments) {
+				db.getCurrentEntityManager().remove(comment);
+			}
+		}
+		return comments == null ? 0 : comments.size();
 	}
 
 	/**
@@ -310,11 +328,18 @@ public class UserCommentsManagerImpl extends UserCommentsManager {
 	public int deleteAllCommentsIgnoringSubPath() {
 		DB db = DBFactory.getInstance();
 		StringBuilder sb = new StringBuilder();
-		sb.append("delete from ").append(UserCommentImpl.class.getName()).append(" where resName=:resName and resId=:resId");
-		return db.getCurrentEntityManager().createQuery(sb.toString())
+		sb.append("select comment from ").append(UserCommentImpl.class.getName()).append(" comment")
+		  .append(" where resName=:resName and resId=:resId")
+		  .append(" order by creationDate desc");
+
+		List<UserCommentImpl> comments = db.getCurrentEntityManager().createQuery(sb.toString(), UserCommentImpl.class)
 			.setParameter("resName", getOLATResourceable().getResourceableTypeName())
 			.setParameter("resId", getOLATResourceable().getResourceableId())
-			.executeUpdate();		
+			.getResultList();
+		for(UserCommentImpl comment:comments) {
+			db.getCurrentEntityManager().remove(comment);
+		}
+		return comments.size();
 	}
 
 	

src/main/java/org/olat/course/assessment/NewCachePersistingAssessmentManager.java

@@ -157,7 +157,7 @@ public class NewCachePersistingAssessmentManager extends BasicManager implements
 	 */
 	private List<Property> loadPropertiesFor(List<Identity> identities) {
 		if(identities == null || identities.isEmpty()) return Collections.emptyList();
-
+		
 		StringBuilder sb = new StringBuilder();
 		sb.append("from org.olat.properties.Property as p")
 		  .append(" inner join fetch p.identity as ident ")