OP-1321: Rename checkMedical into validateMedical (informatici#1385)

* OP-1321: Rename checkMedical into validateMedical

* OP-1321: Rename checkMedical into validateMedical

src/main/java/org/isf/medicals/manager/MedicalBrowsingManager.java

@@ -1,6 +1,6 @@
 /*
  * Open Hospital (www.open-hospital.org)
- * Copyright © 2006-2023 Informatici Senza Frontiere ([email protected])
+ * Copyright © 2006-2024 Informatici Senza Frontiere ([email protected])
  *
  * Open Hospital is a free and open source software for healthcare data management.
  *
@@ -169,7 +169,7 @@ public Medical newMedical(Medical medical) throws OHServiceException {
 	 * @throws OHServiceException
 	 */
 	public Medical newMedical(Medical medical, boolean ignoreSimilar) throws OHServiceException {
-		checkMedicalForInsert(medical, ignoreSimilar);
+		validateMedicalForInsert(medical, ignoreSimilar);
 		return ioOperations.newMedical(medical);
 	}
 
@@ -193,7 +193,7 @@ public Medical updateMedical(Medical medical) throws OHServiceException {
 	 * @throws OHServiceException
 	 */
 	public Medical updateMedical(Medical medical, boolean ignoreSimilar) throws OHServiceException {
-		checkMedicalForUpdate(medical, ignoreSimilar);
+		validateMedicalForUpdate(medical, ignoreSimilar);
 		return ioOperations.updateMedical(medical);
 	}
 
@@ -218,7 +218,7 @@ public void deleteMedical(Medical medical) throws OHServiceException {
 	 * @param medical - the {@link Medical} to insert or update
 	 * @return list of {@link OHExceptionMessage}
 	 */
-	private List<OHExceptionMessage> checkMedicalCommon(Medical medical) {
+	private List<OHExceptionMessage> validateMedicalCommon(Medical medical) {
 		List<OHExceptionMessage> errors = new ArrayList<>();
 		if (medical.getMinqty() < 0) {
 			errors.add(new OHExceptionMessage(MessageBundle.getMessage("angal.medicals.minquantitycannotbelessthan0.msg")));
@@ -233,42 +233,42 @@ private List<OHExceptionMessage> checkMedicalCommon(Medical medical) {
 	}
 
 	/**
-	 * Perform several checks on the provided medical, useful for insert
+	 * Perform several validation checks on the provided medical, useful for insert
 	 *
-	 * @param medical - the {@link Medical} to check
+	 * @param medical - the {@link Medical} to validate
 	 * @param ignoreSimilar - if {@code true}, it will not perform a similarity check.
 	 * {@code warning}: same Medical description in the same {@link MedicalType} category is not allowed anyway
 	 * @throws OHServiceException
 	 */
-	private void checkMedicalForInsert(Medical medical, boolean ignoreSimilar) throws OHServiceException {
-		checkMedical(medical, ignoreSimilar, false);
+	private void validateMedicalForInsert(Medical medical, boolean ignoreSimilar) throws OHServiceException {
+		validateMedical(medical, ignoreSimilar, false);
 	}
 
 	/**
-	 * Perform several checks on the provided medical, useful for update
+	 * Perform several validation checks on the provided medical, useful for update
 	 *
-	 * @param medical - the {@link Medical} to check
+	 * @param medical - the {@link Medical} to validate
 	 * @param ignoreSimilar - if {@code true}, it will not perform a similarity check.
 	 * {@code warning}: same Medical description in the same {@link MedicalType} category is not allowed anyway
 	 * @throws OHServiceException
 	 */
-	public void checkMedicalForUpdate(Medical medical, boolean ignoreSimilar) throws OHServiceException {
-		checkMedical(medical, ignoreSimilar, true);
+	public void validateMedicalForUpdate(Medical medical, boolean ignoreSimilar) throws OHServiceException {
+		validateMedical(medical, ignoreSimilar, true);
 	}
 
 	/**
-	 * Perform several checks on the provided medical, useful for update
+	 * Perform several validation checks on the provided medical, useful for update
 	 *
-	 * @param medical - the {@link Medical} to check
+	 * @param medical - the {@link Medical} to validate
 	 * @param ignoreSimilar - if {@code true}, it will not perform a similarity check.
 	 * {@code warning}: same Medical description in the same {@link MedicalType} category is not allowed anyway
 	 * @param update - if {@code true}, it will not consider the actual {@link Medical}
 	 * @throws OHServiceException
 	 */
-	public void checkMedical(Medical medical, boolean ignoreSimilar, boolean update) throws OHServiceException {
+	public void validateMedical(Medical medical, boolean ignoreSimilar, boolean update) throws OHServiceException {
 
 		//check commons
-		List<OHExceptionMessage> errors = new ArrayList<>(checkMedicalCommon(medical));
+		List<OHExceptionMessage> errors = new ArrayList<>(validateMedicalCommon(medical));
 
 		//check existing data
 		boolean productCodeExists = !medical.getProdCode().isEmpty() && ioOperations.productCodeExists(medical, update);

src/test/java/org/isf/medicals/Tests.java

@@ -496,7 +496,7 @@ void testMgrCheckMedicalCommonBadMinQty() throws Exception {
 			MedicalType medicalType = testMedicalType.setup(false);
 			Medical medical = testMedical.setup(medicalType, false);
 			medical.setMinqty(-1);
-			medicalBrowsingManager.checkMedical(medical, false, false);
+			medicalBrowsingManager.validateMedical(medical, false, false);
 		})
 						.isInstanceOf(OHDataValidationException.class);
 	}
@@ -507,7 +507,7 @@ void testMgrCheckMedicalCommonBadPcsperpck() throws Exception {
 			MedicalType medicalType = testMedicalType.setup(false);
 			Medical medical = testMedical.setup(medicalType, false);
 			medical.setPcsperpck(-1);
-			medicalBrowsingManager.checkMedical(medical, false, false);
+			medicalBrowsingManager.validateMedical(medical, false, false);
 		})
 						.isInstanceOf(OHDataValidationException.class);
 	}
@@ -518,7 +518,7 @@ void testMgrCheckMedicalCommonMissingDescription() throws Exception {
 			MedicalType medicalType = testMedicalType.setup(false);
 			Medical medical = testMedical.setup(medicalType, false);
 			medical.setDescription("");
-			medicalBrowsingManager.checkMedical(medical, false, false);
+			medicalBrowsingManager.validateMedical(medical, false, false);
 		})
 						.isInstanceOf(OHDataValidationException.class);
 	}
@@ -529,7 +529,7 @@ void testMgrCheckMedicalProductCodeExists() throws Exception {
 			int medicalCode = setupTestMedical(false);
 			Medical medical = medicalsIoOperationRepository.findById(medicalCode).orElse(null);
 			assertThat(medical).isNotNull();
-			medicalBrowsingManager.checkMedical(medical, false, false);
+			medicalBrowsingManager.validateMedical(medical, false, false);
 		})
 						.isInstanceOf(OHDataValidationException.class);
 	}
@@ -541,7 +541,7 @@ void testMgrCheckMedicalMedicalExists() throws Exception {
 			Medical medical = medicalsIoOperationRepository.findById(medicalCode).orElse(null);
 			assertThat(medical).isNotNull();
 			medical.setProdCode("");
-			medicalBrowsingManager.checkMedical(medical, false, false);
+			medicalBrowsingManager.validateMedical(medical, false, false);
 		})
 						.isInstanceOf(OHDataValidationException.class);
 	}
@@ -556,7 +556,7 @@ void testMgrCheckMedicalNotIgnoreSimilarNotSimilarMedicalsEmpty() throws Excepti
 			MedicalType medicalType = new MedicalType("code", "description");
 			medicalTypeIoOperationRepository.saveAndFlush(medicalType);
 			medical.setType(medicalType);
-			medicalBrowsingManager.checkMedical(medical, false, false);
+			medicalBrowsingManager.validateMedical(medical, false, false);
 		})
 						.isInstanceOf(OHDataValidationException.class);
 	}