Update comment, move default sort String to constructor

Author: jloux-brapi

src/main/java/org/brapi/test/BrAPITestServer/service/SearchQueryBuilder.java

@@ -14,6 +14,7 @@ public class SearchQueryBuilder<T> {
 	private String selectClause;
 	private String selectOnlyIds;
 	private String whereClause;
+	private String defaultSort;
 	private String sortClause;
 	private Map<String, Object> params;
 	private Class<T> clazz;
@@ -22,6 +23,7 @@ public SearchQueryBuilder(Class<T> clazz) {
 		this.selectClause = "SELECT distinct entity FROM " + clazz.getSimpleName() + " entity ";
 		this.selectOnlyIds = "SELECT entity.id FROM " + clazz.getSimpleName() + " entity ";
 		this.whereClause = "WHERE 1=1 ";
+		this.defaultSort = " ORDER BY entity.id ASC ";
 		this.sortClause = "";
 		this.params = new HashMap<>();
 		this.clazz = clazz;
@@ -30,7 +32,7 @@ public SearchQueryBuilder(Class<T> clazz) {
 	public String getQuery() {
 		if (sortClause.isEmpty()) {
 			// By default, sort on entity id to have query result remain idempotent
-			sortClause = " ORDER BY entity.id ASC ";
+			sortClause = defaultSort;
 		}
 
 		return selectClause + whereClause + sortClause;
@@ -39,7 +41,7 @@ public String getQuery() {
 	public String getIdQuery() {
 		if (sortClause.isEmpty()) {
 			// By default, sort on entity id to have query result remain idempotent
-			sortClause = " ORDER BY entity.id ASC ";
+			sortClause = defaultSort;
 		}
 
 		return selectOnlyIds + whereClause + sortClause;

src/main/java/org/brapi/test/BrAPITestServer/service/germ/GermplasmService.java

@@ -120,7 +120,8 @@ public Page<GermplasmEntity> findGermplasmEntities(@Valid GermplasmSearchRequest
 
 		SearchQueryBuilder<GermplasmEntity> searchQuery = buildGermplasmSearchQuery(request);
 
-		// First run the query without the fetching all the entities, grabbing the IDs only and paginating and sorting them.
+		// Since the built searchQuery contains a lazily loaded collection retrieved with a LEFT JOIN FETCH,
+		// use findAllBySearchPaginatingWithFetches()
 		Page<GermplasmEntity> germs = germplasmRepository.findAllBySearchPaginatingWithFetches(searchQuery, pageReq);
 
 		// Hopefully this retains insertion order in the page?
@@ -336,7 +337,6 @@ private void fetchRemainingGermCollectionsUsingQuery(SearchQueryBuilder<Germplas
 		searchQuery.leftJoinFetch("externalReferences",
 				"externalReferences");
 
-		// TODO: This method doesn't need to utilize a method that returns a page.
 		List<GermplasmEntity> xrefs = germplasmRepository.findAllBySearch(searchQuery);
 
 		Map<String, List<ExternalReferenceEntity>> xrefByEntity = new HashMap<>();