Skip to content

Commit

Permalink
Merge branch 'develop' into OP-1305
Browse files Browse the repository at this point in the history
  • Loading branch information
mwithi authored Oct 28, 2024
2 parents f2e1066 + 4683456 commit ff77c5f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.4</version>
<version>3.3.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public List<MedicalInventory> getMedicalInventoryByStatusAndWard(String status,
* Return a list {@link MedicalInventory}s for passed params.
*
* @param status - the {@link MedicalInventory} status.
* @param type - the {@link MedicalInventory} type.
* @param inventoryType - the {@link MedicalInventory} type.
* @return the list of {@link MedicalInventory}s. It could be {@code empty}.
* @throws OHServiceException
*/
Expand Down Expand Up @@ -253,7 +253,7 @@ public void validateMedicalInventoryRow(MedicalInventory inventory, List<Medical

// TODO: To decide if to make allMedicals parameter
boolean allMedicals = true;
List<Movement> movs = new ArrayList<Movement>();
List<Movement> movs = new ArrayList<>();
List<Medical> inventoryMedicalsList = inventoryRowSearchList.stream()
.map(MedicalInventoryRow::getMedical)
.distinct()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public List<MedicalInventory> getMedicalInventoryByStatusAndWard(String status,
* Return a list of {@link MedicalInventory}s for passed params.
*
* @param status - the {@link MedicalInventory} status.
* @param type - the {@link MedicalInventory} type.
* @param inventoryType - the {@link MedicalInventory} type.
* @return the list of {@link MedicalInventory}s. It could be {@code empty}.
* @throws OHServiceException
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ public void deleteLot(Lot lot) throws OHServiceException {
/**
* Retrieves all medicals referencing the specified code.
*
* @param lotCode the lot code.
* @param code the lot code.
* @return the ids of medicals referencing the specified lot.
* @throws OHServiceException if an error occurs retrieving the referencing medicals.
*/
Expand Down

0 comments on commit ff77c5f

Please sign in to comment.