reduce the proliferation of order by clause

car031 · car031 · commit f7c332ff0101 · 2025-03-07T16:21:48.000+01:00
diff --git a/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDRepository.java b/logicaldoc-cmis/src/main/java/com/logicaldoc/cmis/LDRepository.java
@@ -660,8 +660,9 @@ public String createDocument(CallContext context, Properties properties, String
 			transaction.setUser(user);
 			transaction.setSessionId(sid);
 
-			document = documentManager.create(new BufferedInputStream(contentStream.getStream(), BUFFER_SIZE), document,
-					transaction).getDocument();
+			document = documentManager
+					.create(new BufferedInputStream(contentStream.getStream(), BUFFER_SIZE), document, transaction)
+					.getDocument();
 
 			return getId(document);
 		} catch (Exception t) {
@@ -2959,8 +2960,7 @@ public List<ObjectData> getDocumentLastChanges(long minDate, int max) {
 			params.put("tenantId", getRoot().getTenantId());
 			params.put("minDate", new Date(minDate));
 
-			entries = historyDao.findByWhere(query.toString(), params,
-					"order by " + PersistentObjectDAO.ENTITY + ".date", max);
+			entries = historyDao.findByWhere(query.toString(), params, PersistentObjectDAO.ENTITY + ".date", max);
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);
 		}
@@ -3025,8 +3025,7 @@ public List<ObjectData> getFolderLastChanges(long minDate, int max) {
 			params.put("tenantId", getRoot().getTenantId());
 			params.put("minDate", new Date(minDate));
 
-			entries = folderHistoryDao.findByWhere(query.toString(), params,
-					"order by " + PersistentObjectDAO.ENTITY + ".date", max);
+			entries = folderHistoryDao.findByWhere(query.toString(), params, PersistentObjectDAO.ENTITY + ".date", max);
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);
 		}
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/HibernatePersistentObjectDAO.java
@@ -49,15 +49,15 @@ public abstract class HibernatePersistentObjectDAO<T extends PersistentObject> i
 
 	private static final String AND = " and (";
 
-	protected static final String ORDER_BY = " order by ";
-
 	protected Logger log = LoggerFactory.getLogger(HibernatePersistentObjectDAO.class);
 
 	protected Class<T> entityClass;
 
 	@Resource(name = "SessionFactory")
 	protected SessionFactory sessionFactory;
 
+	protected static final String ORDER_BY = " order by ";
+	
 	protected static final String ASPECT_STORING = "storing";
 
 	protected static final String DEFAULT_WHERE_PREAMBLE = " " + ENTITY + " where " + ENTITY + ".deleted=0 ";
@@ -194,7 +194,7 @@ public List<Long> findIdsByWhere(String where, String order, Integer max) throws
 	public List<Long> findIdsByWhere(String where, Map<String, Object> parameters, String order, Integer max)
 			throws PersistenceException {
 		try {
-			String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY)
+			String sorting = StringUtils.isNotEmpty(order) && !order.toLowerCase().contains(ORDER_BY.trim())
 					? ORDER_BY + order
 					: order;
 			String query = "select " + ENTITY + ".id from " + entityClass.getCanonicalName() + DEFAULT_WHERE_PREAMBLE
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/communication/HibernateMessageTemplateDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/communication/HibernateMessageTemplateDAO.java
@@ -34,7 +34,7 @@ public HibernateMessageTemplateDAO() {
 	@Override
 	public List<MessageTemplate> findByLanguage(String language, long tenantId) throws PersistenceException {
 		return findByWhere(" " + ENTITY + LANGUAGE + language + AND + ENTITY + TENANT_ID + tenantId,
-				"order by " + ENTITY + ".name", null);
+				ENTITY + ".name", null);
 	}
 
 	@Override
@@ -45,7 +45,7 @@ public List<MessageTemplate> findByTypeAndLanguage(String type, String language,
 		if (StringUtils.isNotEmpty(type))
 			query.append(" and " + ENTITY + ".type='" + type + "' ");
 
-		return findByWhere(query.toString(), "order by " + ENTITY + ".name", null);
+		return findByWhere(query.toString(), ENTITY + ".name", null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/contact/HibernateContactDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/contact/HibernateContactDAO.java
@@ -38,6 +38,6 @@ public List<Contact> findByUser(Long userId, String email) throws PersistenceExc
 			params.put("email", email);
 		}
 
-		return findByWhere(sb.toString(), params, "order by " + ENTITY + ".firstName, " + ENTITY + ".lastName", null);
+		return findByWhere(sb.toString(), params, ENTITY + ".firstName, " + ENTITY + ".lastName", null);
 	}
 }
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateBookmarkDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateBookmarkDAO.java
@@ -26,7 +26,7 @@ public HibernateBookmarkDAO() {
 
 	@Override
 	public List<Bookmark> findByUserId(long userId) throws PersistenceException {
-		return findByWhere(ENTITY + USER_ID + userId, "order by " + ENTITY + ".position asc", null);
+		return findByWhere(ENTITY + USER_ID + userId, ENTITY + ".position asc", null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentDAO.java
@@ -878,7 +878,7 @@ public long count(Long tenantId, boolean computeDeleted, boolean computeArchived
 	@Override
 	public List<Document> findByIndexed(int indexed) throws PersistenceException {
 		return findByWhere(ENTITY + ".docRef is null and " + ENTITY + ".indexed=" + indexed,
-				"order by " + ENTITY + ".lastModified asc", null);
+				ENTITY + ".lastModified asc", null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentHistoryDAO.java
@@ -23,8 +23,6 @@ public class HibernateDocumentHistoryDAO extends HibernateHistoryDAO<DocumentHis
 
 	private static final String DATE_ASC = ".date asc";
 
-	private static final String ORDER_BY = "order by ";
-
 	private static final String AND = " and ";
 
 	private HibernateDocumentHistoryDAO() {
@@ -42,7 +40,7 @@ public List<DocumentHistory> findByDocIdAndEvent(long docId, String event) throw
 		StringBuilder query = new StringBuilder(" " + ENTITY + ".docId = " + docId);
 		if (StringUtils.isNotEmpty(event))
 			query.append(AND + ENTITY + ".event='" + SqlUtil.doubleQuotes(event) + "'");
-		return findByWhere(query.toString(), ORDER_BY + ENTITY + ".date desc", null);
+		return findByWhere(query.toString(), ENTITY + ".date desc", null);
 	}
 
 	@Override
@@ -52,12 +50,12 @@ public List<DocumentHistory> findByUserId(long userId) throws PersistenceExcepti
 
 	@Override
 	public List<DocumentHistory> findByFolderId(long folderId) throws PersistenceException {
-		return findByWhere(ENTITY + ".folderId =" + folderId, ORDER_BY + ENTITY + DATE_ASC, null);
+		return findByWhere(ENTITY + ".folderId =" + folderId, ENTITY + DATE_ASC, null);
 	}
 
 	@Override
 	public List<DocumentHistory> findNotNotified(Integer max) throws PersistenceException {
-		return findByWhere(ENTITY + ".notified = 0", ORDER_BY + ENTITY + DATE_ASC, max);
+		return findByWhere(ENTITY + ".notified = 0", ENTITY + DATE_ASC, max);
 	}
 
 	@Override
@@ -74,7 +72,7 @@ public List<DocumentHistory> findByUserIdAndEvent(long userId, String event, Str
 		if (sessionId != null && StringUtils.isNotEmpty(sessionId))
 			query += AND + ENTITY + ".sessionId = '" + sessionId + "'";
 
-		return findByWhere(query, ORDER_BY + ENTITY + DATE_ASC, null);
+		return findByWhere(query, ENTITY + DATE_ASC, null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentNoteDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateDocumentNoteDAO.java
@@ -141,7 +141,7 @@ public List<DocumentNote> findByDocIdAndTypes(long docId, String fileVersion, Co
 
 	@Override
 	public List<DocumentNote> findByUserId(long userId) throws PersistenceException {
-		return findByWhere(ENTITY + ".userId =" + userId, "order by " + ENTITY + ".date desc", null);
+		return findByWhere(ENTITY + ".userId =" + userId, ENTITY + ".date desc", null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateRatingDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateRatingDAO.java
@@ -111,7 +111,7 @@ public Rating findByDocIdAndUserId(long docId, long userId) throws PersistenceEx
 
 	@Override
 	public List<Rating> findByDocId(long docId) throws PersistenceException {
-		return findByWhere(ENTITY + ".docId = " + docId, " order by " + ENTITY + ".lastModified desc", null);
+		return findByWhere(ENTITY + ".docId = " + docId, " ENTITY + ".lastModified desc", null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateVersionDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/HibernateVersionDAO.java
@@ -45,7 +45,7 @@ public HibernateVersionDAO() {
 
 	@Override
 	public List<Version> findByDocId(long docId) throws PersistenceException {
-		return findByWhere(" " + ENTITY + DOC_ID + docId, "order by " + ENTITY + ".versionDate desc", null);
+		return findByWhere(" " + ENTITY + DOC_ID + docId, ENTITY + ".versionDate desc", null);
 	}
 
 	@Override
@@ -63,7 +63,7 @@ public Version findByVersion(long docId, String version) throws PersistenceExcep
 	public Version findByFileVersion(long docId, String fileVersion) throws PersistenceException {
 		List<Version> versions = findByWhere(
 				" " + ENTITY + DOC_ID + docId + " and " + ENTITY + ".fileVersion='" + fileVersion + "'",
-				"order by " + ENTITY + ".date asc", null);
+				ENTITY + ".date asc", null);
 
 		if (!versions.isEmpty())
 			return versions.get(0);
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderDAO.java
@@ -328,7 +328,7 @@ public List<Folder> findByUserId(long userId, long parentId) throws PersistenceE
 
 		if (user.isMemberOf(Group.GROUP_ADMIN))
 			return findByWhere(ENTITY + ".id!=" + ENTITY + ".parentId and " + ENTITY + PARENTID_EQUAL + parentId,
-					" order by " + ENTITY + ".name ", null);
+					ENTITY + ".name ", null);
 		/*
 		 * Search for all those folders that defines its own security policies
 		 */
@@ -376,7 +376,7 @@ public List<Folder> findChildren(long parentId, Integer max) throws PersistenceE
 		Map<String, Object> params = new HashMap<>();
 		params.put(PARENT_ID, parent.getId());
 		return findByWhere(ENTITY + ".parentId = :parentId and " + ENTITY + ".id!=" + ENTITY + ".parentId", params,
-				"order by " + ENTITY + ".name", max);
+				ENTITY + ".name", max);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/folder/HibernateFolderHistoryDAO.java
@@ -25,8 +25,6 @@ public class HibernateFolderHistoryDAO extends HibernateHistoryDAO<FolderHistory
 
 	private static final String DATE_ASC = ".date asc";
 
-	private static final String ORDER_BY = "order by ";
-
 	private HibernateFolderHistoryDAO() {
 		super(FolderHistory.class);
 		super.log = LoggerFactory.getLogger(HibernateFolderHistoryDAO.class);
@@ -39,12 +37,12 @@ public List<FolderHistory> findByUserId(long userId) throws PersistenceException
 
 	@Override
 	public List<FolderHistory> findByFolderId(long folderId) throws PersistenceException {
-		return findByWhere(ENTITY + ".folderId =" + folderId, ORDER_BY + ENTITY + DATE_ASC, null);
+		return findByWhere(ENTITY + ".folderId =" + folderId, ENTITY + DATE_ASC, null);
 	}
 
 	@Override
 	public List<FolderHistory> findNotNotified(Integer max) throws PersistenceException {
-		return findByWhere(ENTITY + ".notified = 0", ORDER_BY + ENTITY + DATE_ASC, max);
+		return findByWhere(ENTITY + ".notified = 0", ENTITY + DATE_ASC, max);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateAttributeSetDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateAttributeSetDAO.java
@@ -25,8 +25,6 @@ public class HibernateAttributeSetDAO extends HibernatePersistentObjectDAO<Attri
 
 	private static final String TENANT_ID_EQUAL = ".tenantId=";
 
-	private static final String ORDER_BY = "order by ";
-
 	@Resource(name = "AttributeOptionDAO")
 	protected AttributeOptionDAO optionsDao;
 
@@ -45,7 +43,7 @@ public List<AttributeSet> findAll() throws PersistenceException {
 
 	@Override
 	public List<AttributeSet> findAll(long tenantId) throws PersistenceException {
-		return findByWhere(" " + ENTITY + TENANT_ID_EQUAL + tenantId, ORDER_BY + ENTITY + ".name", null);
+		return findByWhere(" " + ENTITY + TENANT_ID_EQUAL + tenantId, ENTITY + ".name", null);
 	}
 
 	@Override
@@ -84,7 +82,7 @@ public void delete(long id, int code) throws PersistenceException {
 	@Override
 	public List<AttributeSet> findByType(int type, long tenantId) throws PersistenceException {
 		return findByWhere(ENTITY + ".type =" + type + " and " + ENTITY + TENANT_ID_EQUAL + tenantId,
-				ORDER_BY + ENTITY + ".name asc", null);
+				ENTITY + ".name asc", null);
 	}
 
 	@Override
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateTemplateDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/metadata/HibernateTemplateDAO.java
@@ -33,8 +33,6 @@ public class HibernateTemplateDAO extends HibernatePersistentObjectDAO<Template>
 
 	private static final String TENANT_ID_EQUAL = ".tenantId=";
 
-	private static final String ORDER_BY = "order by ";
-
 	@Resource(name = "UserDAO")
 	protected UserDAO userDAO;
 
@@ -46,7 +44,7 @@ public HibernateTemplateDAO() {
 	@Override
 	public List<Template> findAll() {
 		try {
-			return findByWhere(" 1=1", ORDER_BY + ENTITY + ".name", null);
+			return findByWhere(" 1=1", ENTITY + ".name", null);
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);
 			return new ArrayList<>();
@@ -56,7 +54,7 @@ public List<Template> findAll() {
 	@Override
 	public List<Template> findAll(long tenantId) {
 		try {
-			return findByWhere(" " + ENTITY + TENANT_ID_EQUAL + tenantId, ORDER_BY + ENTITY + ".name", null);
+			return findByWhere(" " + ENTITY + TENANT_ID_EQUAL + tenantId, ENTITY + ".name", null);
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);
 			return new ArrayList<>();
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/HibernateSessionDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/HibernateSessionDAO.java
@@ -81,11 +81,11 @@ public void initialize(Session session) {
 	public List<Session> findByNode(String node) {
 		try {
 			if (StringUtils.isEmpty(node))
-				return findByWhere(" 1=1 ", (Map<String, Object>) null, "order by " + ENTITY + ".creation desc", null);
+				return findByWhere(" 1=1 ", (Map<String, Object>) null, ENTITY + ".creation desc", null);
 			else {
 				Map<String, Object> params = new HashMap<>();
 				params.put("node", node);
-				return findByWhere(ENTITY + ".node = :node", params, "order by " + ENTITY + ".creation desc", null);
+				return findByWhere(ENTITY + ".node = :node", params, ENTITY + ".creation desc", null);
 			}
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/menu/HibernateMenuDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/menu/HibernateMenuDAO.java
@@ -120,7 +120,7 @@ public List<Menu> findByUserId(long userId, long parentId, Integer type, boolean
 						ENTITY + ".id!=" + ENTITY + ".parentId and " + ENTITY + DOT_PARENT_ID + parentId
 								+ (type == null ? "" : (AND + ENTITY + ".type=" + type))
 								+ (enabledOnly ? AND + ENTITY + ".enabled=1" : ""),
-						" order by  " + ENTITY + ".position asc, " + ENTITY + ".name asc", null);
+						ENTITY + ".position asc, " + ENTITY + ".name asc", null);
 			/*
 			 * Search for all those menus that defines its own security policies
 			 */
diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/security/user/HibernateUserHistoryDAO.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/security/user/HibernateUserHistoryDAO.java
@@ -29,14 +29,14 @@ public List<UserHistory> findByUserId(long userId) {
 	public List<UserHistory> findByUserIdAndEvent(long userId, String event) {
 		try {
 			if (StringUtils.isEmpty(event))
-				return findByWhere(ENTITY + ".userId =" + userId, "order by " + ENTITY + ".date desc", null);
+				return findByWhere(ENTITY + ".userId =" + userId, ENTITY + ".date desc", null);
 			else {
 				Map<String, Object> params = new HashMap<>();
 				params.put("userId", userId);
 				params.put("event", event);
 
 				return findByWhere(ENTITY + ".userId = :userId and " + ENTITY + ".event = :event", params,
-						"order by " + ENTITY + ".date desc", null);
+						ENTITY + ".date desc", null);
 			}
 		} catch (PersistenceException e) {
 			log.error(e.getMessage(), e);

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public HibernateMessageTemplateDAO() {`
`34`	`34`	`@Override`
`35`	`35`	`public List<MessageTemplate> findByLanguage(String language, long tenantId) throws PersistenceException {`
`36`	`36`	`return findByWhere(" " + ENTITY + LANGUAGE + language + AND + ENTITY + TENANT_ID + tenantId,`
`37`		`- "order by " + ENTITY + ".name", null);`
	`37`	`+ ENTITY + ".name", null);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Override`
`@@ -45,7 +45,7 @@ public List<MessageTemplate> findByTypeAndLanguage(String type, String language,`
`45`	`45`	`if (StringUtils.isNotEmpty(type))`
`46`	`46`	`query.append(" and " + ENTITY + ".type='" + type + "' ");`
`47`	`47`
`48`		`- return findByWhere(query.toString(), "order by " + ENTITY + ".name", null);`
	`48`	`+ return findByWhere(query.toString(), ENTITY + ".name", null);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ public List<Contact> findByUser(Long userId, String email) throws PersistenceExc`
`38`	`38`	`params.put("email", email);`
`39`	`39`	`}`
`40`	`40`
`41`		`- return findByWhere(sb.toString(), params, "order by " + ENTITY + ".firstName, " + ENTITY + ".lastName", null);`
	`41`	`+ return findByWhere(sb.toString(), params, ENTITY + ".firstName, " + ENTITY + ".lastName", null);`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public HibernateBookmarkDAO() {`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public List<Bookmark> findByUserId(long userId) throws PersistenceException {`
`29`		`- return findByWhere(ENTITY + USER_ID + userId, "order by " + ENTITY + ".position asc", null);`
	`29`	`+ return findByWhere(ENTITY + USER_ID + userId, ENTITY + ".position asc", null);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -878,7 +878,7 @@ public long count(Long tenantId, boolean computeDeleted, boolean computeArchived`
`878`	`878`	`@Override`
`879`	`879`	`public List<Document> findByIndexed(int indexed) throws PersistenceException {`
`880`	`880`	`return findByWhere(ENTITY + ".docRef is null and " + ENTITY + ".indexed=" + indexed,`
`881`		`- "order by " + ENTITY + ".lastModified asc", null);`
	`881`	`+ ENTITY + ".lastModified asc", null);`
`882`	`882`	`}`
`883`	`883`
`884`	`884`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public List<DocumentNote> findByDocIdAndTypes(long docId, String fileVersion, Co`
`141`	`141`
`142`	`142`	`@Override`
`143`	`143`	`public List<DocumentNote> findByUserId(long userId) throws PersistenceException {`
`144`		`- return findByWhere(ENTITY + ".userId =" + userId, "order by " + ENTITY + ".date desc", null);`
	`144`	`+ return findByWhere(ENTITY + ".userId =" + userId, ENTITY + ".date desc", null);`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public Rating findByDocIdAndUserId(long docId, long userId) throws PersistenceEx`
`111`	`111`
`112`	`112`	`@Override`
`113`	`113`	`public List<Rating> findByDocId(long docId) throws PersistenceException {`
`114`		`- return findByWhere(ENTITY + ".docId = " + docId, " order by " + ENTITY + ".lastModified desc", null);`
	`114`	`+ return findByWhere(ENTITY + ".docId = " + docId, " ENTITY + ".lastModified desc", null);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@Override`