Merge remote-tracking branch 'origin/OpenOLAT_14.2'

src/main/java/org/olat/core/commons/services/vfs/manager/VFSRevisionDAO.java

@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import javax.persistence.TemporalType;
 import javax.persistence.TypedQuery;
 
 import org.olat.core.commons.persistence.DB;
@@ -271,22 +272,22 @@ public class VFSRevisionDAO {
 				.createQuery(qb.toString(), VFSRevision.class);
 
 		if(createdAtNewer != null) {
-			query.setParameter("createdAtNewer", createdAtNewer);
+			query.setParameter("createdAtNewer", createdAtNewer, TemporalType.TIMESTAMP);
 		}
 		if(createdAtOlder != null) {
-			query.setParameter("createdAtOlder", createdAtOlder);
+			query.setParameter("createdAtOlder", createdAtOlder, TemporalType.TIMESTAMP);
 		}
 		if(editedAtNewer != null) {
-			query.setParameter("editedAtNewer", editedAtNewer);
+			query.setParameter("editedAtNewer", editedAtNewer, TemporalType.TIMESTAMP);
 		}
 		if(editedAtOlder != null) {
-			query.setParameter("editedAtOlder", editedAtOlder);
+			query.setParameter("editedAtOlder", editedAtOlder, TemporalType.TIMESTAMP);
 		}
 		if(lockedAtNewer != null) {
-			query.setParameter("lockedAtNewer", lockedAtNewer);
+			query.setParameter("lockedAtNewer", lockedAtNewer, TemporalType.TIMESTAMP);
 		}
 		if(lockedAtOlder != null) {
-			query.setParameter("lockedAtOlder", lockedAtOlder);
+			query.setParameter("lockedAtOlder", lockedAtOlder, TemporalType.TIMESTAMP);
 		}
 		if(trashed != null) {
 			query.setParameter("trashed", trashed);
@@ -301,7 +302,7 @@ public class VFSRevisionDAO {
 			query.setParameter("revisionCount", revisionCount);
 		}
 		if(size > 0) {
-			query.setParameter("size", new Long(size));
+			query.setParameter("size", Long.valueOf(size));
 		}
 		
 		return query.setFirstResult(0)

src/test/java/org/olat/core/commons/services/vfs/manager/VFSRevisionDAOTest.java

@@ -225,17 +225,22 @@ public class VFSRevisionDAOTest extends OlatTestCase {
 	
 	@Test
 	public void getLargest() {
+		Date fiveMinutesInThePast = Date.from(ZonedDateTime.now().minusMinutes(5).toInstant());
+		
 		Identity author = JunitTestHelper.createAndPersistIdentityAsRndUser("rev-1");
 		VFSMetadata metadata1 = vfsMetadataDao.createMetadata(UUID.randomUUID().toString(), "test/revs", "text1.txt",
 				new Date(), 10l, false, "file:///text.tx", "file", null);
-		VFSRevision revision1 = revisionDao.createRevision(author, "._oo_vr_1_text.txt", 1, 25l, Date.from(ZonedDateTime.now().minusMinutes(5).toInstant()), "A comment", metadata1);
+		VFSRevision revision1 = revisionDao.createRevision(author, "._oo_vr_1_text.txt", 1, 25l, fiveMinutesInThePast, "A comment", metadata1);
 		VFSMetadata metadata2 = vfsMetadataDao.createMetadata(UUID.randomUUID().toString(), "test/revs", "text2.txt",
 				new Date(), 10l, false, "file:///text.tx", "file", null);
-		VFSRevision revision2 = revisionDao.createRevision(author, "._oo_vr_2_text.txt", 1, 25l, Date.from(ZonedDateTime.now().minusMinutes(5).toInstant()), "A comment", metadata2);
+		VFSRevision revision2 = revisionDao.createRevision(author, "._oo_vr_2_text.txt", 1, 25l, fiveMinutesInThePast, "A comment", metadata2);
 		VFSMetadata metadata3 = vfsMetadataDao.createMetadata(UUID.randomUUID().toString(), "test/revs", "text3.txt",
 				new Date(), 10l, false, "file:///text.tx", "file", null);
-		VFSRevision revision3 = revisionDao.createRevision(author, "._oo_vr_3_text.txt", 1, 25l, Date.from(ZonedDateTime.now().minusMinutes(5).toInstant()), "A comment", metadata3);
+		VFSRevision revision3 = revisionDao.createRevision(author, "._oo_vr_3_text.txt", 1, 25l, fiveMinutesInThePast, "A comment", metadata3);
 		dbInstance.commitAndCloseSession();
+		Assert.assertNotNull(revision1);
+		Assert.assertNotNull(revision2);
+		Assert.assertNotNull(revision3);
 		
 		int maxResult = 100;
 		Date createdAtNewer = Date.from(ZonedDateTime.now().minusMonths(10).toInstant());