Skip to content

Commit 47bac4b

Browse files
committed
Default max hits to null to avoid any backwards compatability issues
1 parent 8b6bb33 commit 47bac4b

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

src/main/java/com/labsynch/labseer/api/ApiDDictValueController.java

+13-7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import java.util.Collection;
55
import java.util.List;
66

7+
import javax.persistence.TypedQuery;
8+
79
import com.labsynch.labseer.domain.DDictValue;
810
import com.labsynch.labseer.dto.CodeTableDTO;
911
import com.labsynch.labseer.exceptions.ErrorMessage;
@@ -323,7 +325,7 @@ public ResponseEntity<java.lang.String> getDDictValuesByTypeKindFormat(
323325
@PathVariable("lsType") String lsType,
324326
@PathVariable("lsKind") String lsKind,
325327
@PathVariable("format") String format,
326-
@RequestParam(value = "maxHits", defaultValue = "100", required = false) Integer maxHits,
328+
@RequestParam(value = "maxHits", required = false) Integer maxHits,
327329
@RequestParam(value = "shortName", defaultValue = "", required = false) String shortName,
328330
@RequestParam(value = "labelTextSearchTerm", defaultValue = "", required = false) String labelTextSearchTerm) {
329331

@@ -344,13 +346,17 @@ public ResponseEntity<java.lang.String> getDDictValuesByTypeKindFormat(
344346

345347
List<DDictValue> dDictResults;
346348
if (labelTextSearchTerm.isEmpty() && shortName.isEmpty()) {
347-
dDictResults = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind)
348-
.setMaxResults(maxHits)
349-
.getResultList();
349+
TypedQuery<DDictValue> dDictResultsQuery = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEquals(lsType, lsKind);
350+
if (maxHits != null) {
351+
dDictResultsQuery = dDictResultsQuery.setMaxResults(maxHits);
352+
}
353+
dDictResults = dDictResultsQuery.getResultList();
350354
} else if (!shortName.isEmpty()) {
351-
dDictResults = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(lsType, lsKind, shortName)
352-
.setMaxResults(maxHits)
353-
.getResultList();
355+
TypedQuery<DDictValue> dDictResultsQuery = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndShortNameEquals(lsType, lsKind, shortName);
356+
if (maxHits != null) {
357+
dDictResultsQuery = dDictResultsQuery.setMaxResults(maxHits);
358+
}
359+
dDictResults = dDictResultsQuery.getResultList();
354360
} else {
355361
dDictResults = DDictValue.findDDictValuesByLsTypeEqualsAndLsKindEqualsAndLabelTextSearch(lsType, lsKind, labelTextSearchTerm, maxHits);
356362
}

src/main/java/com/labsynch/labseer/domain/DDictValue.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,12 @@ public static List<DDictValue> findDDictValuesByLsTypeEqualsAndLsKindEqualsAndLa
599599
q.setParameter("lsKind", lsKind);
600600
q.setParameter("labelText", labelText.toLowerCase());
601601
q.setParameter("formattedLabelText", formattedLabelText);
602+
if (maxHits != null) {
603+
q = q.setMaxResults(maxHits);
604+
}
605+
602606
@SuppressWarnings("unchecked")
603-
List<DDictValue> results = q.setMaxResults(maxHits).getResultList();
607+
List<DDictValue> results = q.getResultList();
604608
return results;
605609
}
606610

0 commit comments

Comments
 (0)